Merge branch 'for-linus' into for-next

To merge HD-audio fixes back to 3.7 development line

diff --cc sound/pci/hda/hda_codec.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge

diff --cc sound/usb/endpoint.c
Simple merge