Merge remote-tracking branch 'pinctrl/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:39 +0000 (14:59 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:39 +0000 (14:59 +0200)
1  2 
arch/blackfin/Kconfig
drivers/gpio/gpiolib.c

Simple merge
Simple merge