next-20150925/battery

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

Mon, 2 Nov 2015 00:59:52 +0000 (11:59 +1100)

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

Mon, 2 Nov 2015 00:59:52 +0000 (11:59 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 00:59:52 +0000 (11:59 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 00:59:52 +0000 (11:59 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/configs/omap2plus_defconfig
Simple merge
diff --cc drivers/power/Kconfig
Simple merge
diff --cc drivers/power/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 2 Nov 2015 00:59:52 +0000 (11:59 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 2 Nov 2015 00:59:52 +0000 (11:59 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/omap2plus_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history