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

author Mark Brown <broonie@linaro.org>

Thu, 17 Oct 2013 23:32:07 +0000 (00:32 +0100)

committer Mark Brown <broonie@linaro.org>

Thu, 17 Oct 2013 23:32:07 +0000 (00:32 +0100)
author Mark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 23:32:07 +0000 (00:32 +0100)
committer Mark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 23:32:07 +0000 (00:32 +0100)
diff --cc arch/blackfin/Kconfig
Simple merge
diff --cc drivers/gpio/gpiolib.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 17 Oct 2013 23:32:07 +0000 (00:32 +0100)
committer	Mark Brown <broonie@linaro.org>
	Thu, 17 Oct 2013 23:32:07 +0000 (00:32 +0100)
		1	2
arch/blackfin/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	patch \|	diff1 \|	diff2 \|	blob \| history