Merge branch 'topic/hda' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 12 Jan 2012 08:59:18 +0000 (09:59 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 12 Jan 2012 08:59:18 +0000 (09:59 +0100)
commit9e4ce164ee3a1d07580f017069c25d180b0aa785
tree7569661eae727a5a349e4c98dba42ca681857462
parent627b79628f56c3deeb17dec1edf6899b49552fa4
parentf2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33
Merge branch 'topic/hda' into for-linus
sound/core/Kconfig
sound/core/Makefile
sound/pci/hda/hda_intel.c