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

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

Tue, 13 Dec 2011 06:10:47 +0000 (17:10 +1100)

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

Tue, 13 Dec 2011 06:10:47 +0000 (17:10 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:10:47 +0000 (17:10 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:10:47 +0000 (17:10 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-u300/core.c
Simple merge
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/gpio/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Dec 2011 06:10:47 +0000 (17:10 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Dec 2011 06:10:47 +0000 (17:10 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history