Merge branch 'topic/hda' into for-linus

author Takashi Iwai <[email protected]>

Fri, 22 Jul 2011 06:43:27 +0000 (08:43 +0200)

committer Takashi Iwai <[email protected]>

Fri, 22 Jul 2011 06:43:27 +0000 (08:43 +0200)
author Takashi Iwai <[email protected]>
Fri, 22 Jul 2011 06:43:27 +0000 (08:43 +0200)
committer Takashi Iwai <[email protected]>
Fri, 22 Jul 2011 06:43:27 +0000 (08:43 +0200)
diff --cc sound/pci/hda/hda_codec.c
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
author	Takashi Iwai <[email protected]>
	Fri, 22 Jul 2011 06:43:27 +0000 (08:43 +0200)
committer	Takashi Iwai <[email protected]>
	Fri, 22 Jul 2011 06:43:27 +0000 (08:43 +0200)
		1	2
sound/pci/hda/hda_codec.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history