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

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

Mon, 12 Nov 2012 03:16:10 +0000 (14:16 +1100)

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

Mon, 12 Nov 2012 03:16:10 +0000 (14:16 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 03:16:10 +0000 (14:16 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 03:16:10 +0000 (14:16 +1100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/gpio/gpiolib.c
Simple merge
diff --cc include/asm-generic/gpio.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Nov 2012 03:16:10 +0000 (14:16 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Nov 2012 03:16:10 +0000 (14:16 +1100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-generic/gpio.h	patch \|	diff1 \|	diff2 \|	blob \| history