Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
Conflicts:
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Showing
arch/arm/mach-gemini/Kconfig
0 → 100644
arch/arm/mach-gemini/gpio.c
0 → 100644
arch/arm/mach-gemini/irq.c
0 → 100644
arch/arm/mach-gemini/mm.c
0 → 100644
arch/arm/mach-gemini/time.c
0 → 100644
arch/arm/mm/cache-fa.S
0 → 100644
arch/arm/mm/copypage-fa.c
0 → 100644
arch/arm/mm/proc-fa526.S
0 → 100644
arch/arm/mm/tlb-fa.S
0 → 100644
Please register or sign in to comment