Merge branch 'gpio-key-wakeup-fix' into omap-for-v4.11/fixes

author Tony Lindgren <tony@atomide.com>

Tue, 28 Feb 2017 16:46:30 +0000 (08:46 -0800)

committer Tony Lindgren <tony@atomide.com>

Tue, 28 Feb 2017 16:46:30 +0000 (08:46 -0800)
author Tony Lindgren <tony@atomide.com>
Tue, 28 Feb 2017 16:46:30 +0000 (08:46 -0800)
committer Tony Lindgren <tony@atomide.com>
Tue, 28 Feb 2017 16:46:30 +0000 (08:46 -0800)
diff --cc arch/arm/boot/dts/Makefile
Simple merge
diff --cc arch/arm/boot/dts/am335x-bone-common.dtsi
Simple merge
diff --cc arch/arm/boot/dts/am335x-icev2.dts
Simple merge
diff --cc arch/arm/boot/dts/am57xx-idk-common.dtsi
Simple merge
diff --cc arch/arm/boot/dts/omap3-n900.dts
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 28 Feb 2017 16:46:30 +0000 (08:46 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 28 Feb 2017 16:46:30 +0000 (08:46 -0800)
		1	2
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am335x-bone-common.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am335x-icev2.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am57xx-idk-common.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap3-n900.dts	patch \|	diff1 \|	diff2 \|	blob \| history