]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: soc: update arm-soc contents after at91/gpio merge
authorArnd Bergmann <arnd@arndb.de>
Tue, 29 Nov 2011 15:52:32 +0000 (15:52 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 29 Nov 2011 15:52:32 +0000 (15:52 +0000)
The at91/gpio branch has a dependency on the macb-gem
branch. Pull in only parts of that so we still have
a cleanup branch that can go in first.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/arm-soc-for-next-contents.txt

index 7bfca51161309c1ba694cfc4a5bfe497e7f61abb..56803246ce696a7fd38733123ba998de935d142a 100644 (file)
@@ -6,6 +6,8 @@ Currently there are no dependencies.
 
 next/cleanup
   at91/ioremap         git://github.com/at91linux/linux-at91.git for-arnd-3.3-ioremap
+  at91/gpio            git://github.com/at91linux/linux-at91.git for-arnd-3.3-gpio
+  drivers/macb-gem-cleanup     parts of drivers/macb-gem that at91/gpio depends on
 
 next/drivers
   drivers/macb-gem     git://github.com/jamieiles/linux-2.6-ji.git macb-gem