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)
commit88f1236bfa9586ca458b67abde8ce91665bba079
treea34d33e43ad652532255dafeecc9b99f1ce40137
parent70a3887a8d843b8485d90bea6733e53c4c076c41
parent8b99aba70c5f581860736855e211cf981f438ad2
Merge branch 'for-linus' into for-next

Conflicts:
sound/pci/hda/patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c