]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'devel' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 24 Oct 2012 08:16:48 +0000 (10:16 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 24 Oct 2012 08:16:48 +0000 (10:16 +0200)
1  2 
drivers/gpio/gpio-omap.c

Simple merge