summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-22 19:03:44 +0400
committerTakashi Iwai <tiwai@suse.de>2009-06-22 19:03:44 +0400
commit366890df46c2fd9492c04fe3a8775447b7b053e4 (patch)
tree57636b800255477ab3a51dcfaa59201c8c0ee38a /kernel
parent70052413e7b432ccef8ee82340fc01831a1a290c (diff)
parent29959a09cc1aabd2d5f4f03afc0305de6bd29248 (diff)
downloadlinux-366890df46c2fd9492c04fe3a8775447b7b053e4.tar.xz
Merge branch 'topic/ctxfi' into for-linus
* topic/ctxfi: ALSA: ctxfi - Add PM support ALSA: ctxfi - Allow unknown PCI SSIDs
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions