Merge remote-tracking branch 'mmc/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 03:43:07 +0000 (14:43 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 03:43:07 +0000 (14:43 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:43:07 +0000 (14:43 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:43:07 +0000 (14:43 +1100)
diff --cc arch/arm/mach-pxa/lubbock.c
Simple merge
diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge
diff --cc arch/arm/mach-pxa/palmld.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 03:43:07 +0000 (14:43 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 03:43:07 +0000 (14:43 +1100)
		1	2
arch/arm/mach-pxa/lubbock.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmld.c	patch \|	diff1 \|	diff2 \|	blob \| history