]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7a31714982fe4a98ec87ab4b107d0d925d718803
treea34d33e43ad652532255dafeecc9b99f1ce40137
parentc1242ac4f371f0a725f7c301bb395019d1786c60
parent6113c176299516bf164d9175ff1981f55463d68d
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