Merge branch 'allwinner-sunxi' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 8 Feb 2013 13:26:49 +0000 (14:26 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 8 Feb 2013 13:26:49 +0000 (14:26 +0100)
commit7ac63ac61d67703aba1add4a89c4de702068d2f2
tree977691d43adcaca42181b61ef34b6f90455f1187
parent879029c701fa6c9a46b9c80ebf8f5316c490cbfe
parenta0d72094f0abad3cbeeed618d24fd0ce1968d1a8
Merge branch 'allwinner-sunxi' into devel
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile