From 49258c9c50ca5165b3e56f62526fbc53c21cb2a7 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 29 Nov 2011 15:52:32 +0000 Subject: [PATCH] ARM: soc: update arm-soc contents after at91/gpio merge 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 --- arch/arm/arm-soc-for-next-contents.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt index 7bfca5116130..56803246ce69 100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@ -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 -- 2.39.5