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

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

Wed, 26 Sep 2012 04:45:41 +0000 (14:45 +1000)

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

Wed, 26 Sep 2012 04:45:41 +0000 (14:45 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 04:45:41 +0000 (14:45 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 04:45:41 +0000 (14:45 +1000)
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/gpio/Makefile
Simple merge
diff --cc drivers/gpio/gpio-bt8xx.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 26 Sep 2012 04:45:41 +0000 (14:45 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 26 Sep 2012 04:45:41 +0000 (14:45 +1000)
		1	2
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-bt8xx.c	patch \|	diff1 \|	diff2 \|	blob \| history