diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-22 17:03:44 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-22 17:03:44 +0200 |
commit | 366890df46c2fd9492c04fe3a8775447b7b053e4 (patch) | |
tree | 57636b800255477ab3a51dcfaa59201c8c0ee38a /fs/nls/nls_iso8859-15.c | |
parent | Merge branch 'topic/asoc' into for-linus (diff) | |
parent | ALSA: ctxfi - Add PM support (diff) | |
download | linux-366890df46c2fd9492c04fe3a8775447b7b053e4.tar.xz linux-366890df46c2fd9492c04fe3a8775447b7b053e4.zip |
Merge branch 'topic/ctxfi' into for-linus
* topic/ctxfi:
ALSA: ctxfi - Add PM support
ALSA: ctxfi - Allow unknown PCI SSIDs
Diffstat (limited to 'fs/nls/nls_iso8859-15.c')
0 files changed, 0 insertions, 0 deletions