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

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

Tue, 10 Dec 2013 03:15:02 +0000 (14:15 +1100)

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

Tue, 10 Dec 2013 03:15:02 +0000 (14:15 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Dec 2013 03:15:02 +0000 (14:15 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Dec 2013 03:15:02 +0000 (14:15 +1100)
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/gpio/Makefile
Simple merge
diff --cc drivers/pinctrl/pinctrl-baytrail.c
Simple merge
diff --cc drivers/pinctrl/pinctrl-nomadik.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Dec 2013 03:15:02 +0000 (14:15 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Dec 2013 03:15:02 +0000 (14:15 +1100)
		1	2
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-baytrail.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-nomadik.c	patch \|	diff1 \|	diff2 \|	blob \| history