| commit | 366890df46c2fd9492c04fe3a8775447b7b053e4 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Jun 22 17:03:44 2009 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Jun 22 17:03:44 2009 +0200 |
| tree | 57636b800255477ab3a51dcfaa59201c8c0ee38a | |
| parent | 70052413e7b432ccef8ee82340fc01831a1a290c [diff] | |
| parent | 29959a09cc1aabd2d5f4f03afc0305de6bd29248 [diff] |
Merge branch 'topic/ctxfi' into for-linus * topic/ctxfi: ALSA: ctxfi - Add PM support ALSA: ctxfi - Allow unknown PCI SSIDs