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

author Thierry Reding <treding@nvidia.com>

Fri, 25 Oct 2013 09:32:13 +0000 (11:32 +0200)

committer Thierry Reding <treding@nvidia.com>

Fri, 25 Oct 2013 09:32:13 +0000 (11:32 +0200)
author Thierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:32:13 +0000 (11:32 +0200)
committer Thierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:32:13 +0000 (11:32 +0200)
diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge
diff --cc sound/pci/hda/hda_codec.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
author	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:32:13 +0000 (11:32 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:32:13 +0000 (11:32 +0200)
		1	2
drivers/platform/x86/thinkpad_acpi.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history