]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'devel' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 18 Sep 2012 21:31:53 +0000 (23:31 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 18 Sep 2012 21:31:53 +0000 (23:31 +0200)
1  2 
drivers/gpio/Kconfig
drivers/gpio/gpio-em.c

Simple merge
Simple merge