Merge remote-tracking branch 'regulator/for-next'

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

Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)

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

Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
diff --cc drivers/mfd/sec-core.c
Simple merge
diff --cc drivers/regulator/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/sec-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/regulator/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history