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

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

Wed, 12 Sep 2012 06:12:22 +0000 (16:12 +1000)

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

Wed, 12 Sep 2012 06:12:22 +0000 (16:12 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:12:22 +0000 (16:12 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:12:22 +0000 (16:12 +1000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/pinctrl/Kconfig
Simple merge
diff --cc drivers/pinctrl/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 12 Sep 2012 06:12:22 +0000 (16:12 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 12 Sep 2012 06:12:22 +0000 (16:12 +1000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history