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)
Conflicts:
sound/pci/hda/hda_intel.c


Trivial merge