Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 4 Jul 2014 05:48:57 +0000 (07:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 4 Jul 2014 05:48:57 +0000 (07:48 +0200)
commit1a0e3f9639ebe7f0f17b40eb96d03c05ec067979
tree55a007e8903e097cc1fee52dd17887b92d60c257
parentd5471e67229adb31a1e5f026955d006f06315f3d
parente4d9e513dedb5ac4e166c1053314fa935ddecc8c
Merge branch 'for-linus' into for-next

Conflicts:
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_i915.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c