Merge remote-tracking branch 'sound/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 30 Oct 2012 01:24:14 +0000 (12:24 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 30 Oct 2012 01:24:14 +0000 (12:24 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 01:24:14 +0000 (12:24 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 01:24:14 +0000 (12:24 +1100)
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 30 Oct 2012 01:24:14 +0000 (12:24 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 30 Oct 2012 01:24:14 +0000 (12:24 +1100)
		1	2
sound/pci/hda/hda_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_sigmatel.c	patch \|	diff1 \|	diff2 \|	blob \| history