Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

author Tony Lindgren <[email protected]>

Tue, 28 Aug 2018 16:58:03 +0000 (09:58 -0700)

committer Tony Lindgren <[email protected]>

Tue, 28 Aug 2018 16:58:03 +0000 (09:58 -0700)
author Tony Lindgren <[email protected]>
Tue, 28 Aug 2018 16:58:03 +0000 (09:58 -0700)
committer Tony Lindgren <[email protected]>
Tue, 28 Aug 2018 16:58:03 +0000 (09:58 -0700)
diff --cc arch/arm/boot/dts/omap4-droid4-xt894.dts
Simple merge
diff --cc drivers/bus/ti-sysc.c
Simple merge
author	Tony Lindgren <[email protected]>
	Tue, 28 Aug 2018 16:58:03 +0000 (09:58 -0700)
committer	Tony Lindgren <[email protected]>
	Tue, 28 Aug 2018 16:58:03 +0000 (09:58 -0700)
		1	2
arch/arm/boot/dts/omap4-droid4-xt894.dts	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/bus/ti-sysc.c	patch \|	diff1 \|	diff2 \|	blob \| history