Merge branch 'topic/jack' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sat, 2 May 2015 08:02:30 +0000 (10:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 2 May 2015 08:02:30 +0000 (10:02 +0200)
1  2 
sound/pci/hda/Kconfig
sound/pci/hda/hda_codec.h

Simple merge
Simple merge