diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 16:14:26 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-20 16:14:26 -0400 |
| commit | ddf83485d7da468251716b8040bac1280622181e (patch) | |
| tree | d28e9b511dedcfed447577f4bb49a99b244a9430 /sound/isa/Kconfig | |
| parent | 099d53c308f50e8ee5b6638ec3f40f0104b3ee31 (diff) | |
| parent | 535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (diff) | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/pci/hda/hda_codec.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/Kconfig')
0 files changed, 0 insertions, 0 deletions