Merge branch 'topic/ctxfi' into for-linus
commit366890df46c2fd9492c04fe3a8775447b7b053e4
authorTakashi Iwai <tiwai@suse.de>
Mon, 22 Jun 2009 15:03:44 +0000 (22 17:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 22 Jun 2009 15:03:44 +0000 (22 17:03 +0200)
tree57636b800255477ab3a51dcfaa59201c8c0ee38a
parent70052413e7b432ccef8ee82340fc01831a1a290c
parent29959a09cc1aabd2d5f4f03afc0305de6bd29248
Merge branch 'topic/ctxfi' into for-linus

* topic/ctxfi:
  ALSA: ctxfi - Add PM support
  ALSA: ctxfi - Allow unknown PCI SSIDs