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

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

Wed, 19 Jun 2013 06:02:50 +0000 (16:02 +1000)

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

Wed, 19 Jun 2013 06:02:50 +0000 (16:02 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:02:50 +0000 (16:02 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:02:50 +0000 (16:02 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/gpio/gpio-langwell.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 06:02:50 +0000 (16:02 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 06:02:50 +0000 (16:02 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-langwell.c	patch \|	diff1 \|	diff2 \|	blob \| history