Merge remote-tracking branch 'gpio/gpio/next'

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

Wed, 21 Dec 2011 03:52:37 +0000 (14:52 +1100)

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

Wed, 21 Dec 2011 03:52:37 +0000 (14:52 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:52:37 +0000 (14:52 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:52:37 +0000 (14:52 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/spi/spi-pl022.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 03:52:37 +0000 (14:52 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 03:52:37 +0000 (14:52 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-pl022.c	patch \|	diff1 \|	diff2 \|	blob \| history