Merge branch 'v4.18/nand-cs-simplification' into v4.18/soc

author Sekhar Nori <nsekhar@ti.com>

Wed, 2 May 2018 09:34:15 +0000 (15:04 +0530)

committer Sekhar Nori <nsekhar@ti.com>

Wed, 2 May 2018 09:34:15 +0000 (15:04 +0530)
author Sekhar Nori <nsekhar@ti.com>
Wed, 2 May 2018 09:34:15 +0000 (15:04 +0530)
committer Sekhar Nori <nsekhar@ti.com>
Wed, 2 May 2018 09:34:15 +0000 (15:04 +0530)
diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge
diff --cc arch/arm/mach-davinci/board-neuros-osd2.c
Simple merge
author	Sekhar Nori <nsekhar@ti.com>
	Wed, 2 May 2018 09:34:15 +0000 (15:04 +0530)
committer	Sekhar Nori <nsekhar@ti.com>
	Wed, 2 May 2018 09:34:15 +0000 (15:04 +0530)
		1	2
arch/arm/mach-davinci/board-dm644x-evm.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-neuros-osd2.c	patch \|	diff1 \|	diff2 \|	blob \| history