Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 15 Jun 2015 11:15:48 +0000 (13:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 15 Jun 2015 11:15:48 +0000 (13:15 +0200)
Conflicts:
sound/pci/hda/patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Trivial merge