]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 22 Aug 2017 13:44:45 +0000 (15:44 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 22 Aug 2017 13:44:45 +0000 (15:44 +0200)
commit9e69da43ac2315cbbdb772ecd9d59c9f0145bd58
treef0d1a3889fd027e017faa37fc34bffe2fa038c41
parent279d13ea930ac87727945e2fe09d075b02c7375b
parentaff44ff790b883cf327c27e375e3b08bbf4e1eb8
Merge branch 'for-linus' into for-next

Conflicts:
sound/core/control.c
sound/core/control.c
sound/firewire/motu/motu.c
sound/usb/mixer.c
sound/usb/quirks.c