review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3a93d08 88c54cd)

author	Takashi Iwai <tiwai@suse.de>
	Tue, 22 Aug 2017 13:44:45 +0000 (15:44 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Tue, 22 Aug 2017 13:44:45 +0000 (15:44 +0200)
commit	241bc82e62b28fdb7223b85180fd814f4963c971
tree	f0d1a3889fd027e017faa37fc34bffe2fa038c41	tree \| snapshot
parent	3a93d082bacf887b47737c4b75c083dea7570832	commit \| diff
parent	88c54cdf61f508ebcf8da2d819f5dfc03e954d1d	commit \| diff

Merge branch 'for-linus' into for-next

Conflicts:
sound/core/control.c

sound/core/control.c	diff1 \|	diff2 \|	blob \| history
sound/firewire/motu/motu.c	diff1 \|	diff2 \|	blob \| history
sound/usb/mixer.c	diff1 \|	diff2 \|	blob \| history
sound/usb/quirks.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;