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

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

Wed, 21 Dec 2011 04:45:25 +0000 (15:45 +1100)

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

Wed, 21 Dec 2011 04:45:25 +0000 (15:45 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:45:25 +0000 (15:45 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:45:25 +0000 (15:45 +1100)
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/mfd/Kconfig
Simple merge
diff --cc drivers/mfd/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 04:45:25 +0000 (15:45 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 04:45:25 +0000 (15:45 +1100)
		1	2
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history