Merge branch 'for-linus' into for-next

author Takashi Iwai <tiwai@suse.de>

Wed, 12 Feb 2014 09:34:27 +0000 (10:34 +0100)

committer Takashi Iwai <tiwai@suse.de>

Wed, 12 Feb 2014 09:34:27 +0000 (10:34 +0100)
author Takashi Iwai <tiwai@suse.de>
Wed, 12 Feb 2014 09:34:27 +0000 (10:34 +0100)
committer Takashi Iwai <tiwai@suse.de>
Wed, 12 Feb 2014 09:34:27 +0000 (10:34 +0100)
diff --cc sound/pci/hda/hda_generic.c
Simple merge
diff --cc sound/pci/hda/hda_generic.h
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/hda/patch_conexant.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Wed, 12 Feb 2014 09:34:27 +0000 (10:34 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Wed, 12 Feb 2014 09:34:27 +0000 (10:34 +0100)
		1	2
sound/pci/hda/hda_generic.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_generic.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_conexant.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history