[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)
commit6705cda24fad1cb0ac82ac4f312df8ec735b39b0
tree459a5152ce00e49f9f4d462031d1d7de0e33028f
parent0215ffb08ce99e2bb59eca114a99499a4d06e704
parent208a49f086ed8cfb3cfa15579c7ee162c54a999b
parentd4f3e084adf5414539ebb01848b851fe0f888084
parent05f96ef1189ecbf2e8548056a0ca016e4f630cef
parent2dc20a51dc1e2da6eae1182cfe4c4835fca26017
parent47d7e524b7d51aa77b381fbc9b9c5d3f309e434e
parent285f5fa7e9a35e75d9022f9b036ed709721c5cdf
[ARM] Merge individual ARM sub-trees

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:
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