[ARM] Merge individual ARM sub-trees
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 7 Dec 2006 23:07:26 +0000 (23:07 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 7 Dec 2006 23:07:26 +0000 (23:07 +0000)
Merge:
 Atmel AT91RM9200 and AT91SAM9260 changes
 General ARM developments
 Disconfiguous memory cleanups
 64-bit/32-bit division and sched_clock extension patches
 EP93xx support changes
 IOP support changes

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 files changed:
1  2  3  4  5  6  7 
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/configs/at91rm9200dk_defconfig
arch/arm/configs/at91rm9200ek_defconfig
arch/arm/configs/csb637_defconfig
arch/arm/configs/ep93xx_defconfig
arch/arm/configs/kb9202_defconfig
arch/arm/kernel/setup.c
arch/arm/mach-at91rm9200/gpio.c
arch/arm/mach-at91rm9200/irq.c
arch/arm/mach-versatile/core.c
arch/arm/mm/Kconfig

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge