Merge branch 'misc' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:20:02 +0000 (14:20 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:20:02 +0000 (14:20 +0100)
commitceb0885d3b01bb2e2f18765770e212914f2864be
tree0952c90cd49704a9172e985ca491d79b60c40bc8
parentb31fc7af78e17b0203e1cd5a195c590e8adeae0d
parent08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2
Merge branch 'misc' into devel

Conflicts:
arch/arm/mm/init.c
arch/arm/Kconfig
arch/arm/include/asm/memory.h
arch/arm/kernel/machine_kexec.c
arch/arm/mach-ixp4xx/common-pci.c
arch/arm/mm/init.c
arch/arm/mm/mmu.c