git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4ce535e d434405)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 14 Apr 2021 17:53:39 +0000 (19:53 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 14 Apr 2021 17:53:39 +0000 (19:53 +0200)
commit	a00fcbc115f9c934fe92e96358a7f392bb5549f0
tree	6733e44bb7efc8b49772f080c906ccd90b274008	tree
parent	4ce535ec0084f0d712317cb99d383cad3288e713	commit \| diff
parent	d434405aaab7d0ebc516b68a8fc4100922d7f5ef	commit \| diff

Merge tag 'v5.12-rc7' into driver-core-next

We need the driver core fix in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/base/dd.c	diff1 \|	diff2 \|	blob \| history
drivers/clk/clk.c	diff1 \|	diff2 \|	blob \| history
drivers/of/property.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.