Merge remote-tracking branch 'mfd-lj/for-mfd-next'

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

Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)

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

Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)
diff --cc drivers/i2c/busses/Kconfig
Simple merge
diff --cc drivers/mfd/Kconfig
Simple merge
diff --cc drivers/mfd/Makefile
Simple merge
diff --cc drivers/mfd/syscon.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)
		1	2
drivers/i2c/busses/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/syscon.c	patch \|	diff1 \|	diff2 \|	blob \| history