Merge branch 'devel-stable' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 16:24:04 +0000 (17:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 16:24:04 +0000 (17:24 +0100)
commitac1d426e825ab5778995f2f6f053ca2e6b45c622
tree75b91356ca39463e0112931aa6790802fb1e07a2
parentfda0e18c8a7a3e02747c2b045b4fcd2c920410b9
parenta3685f00652af83f12b63e3b4ef48f29581ba48b
Merge branch 'devel-stable' into devel

Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
26 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/common/clkdev.c
arch/arm/include/asm/system.h
arch/arm/kernel/smp.c
arch/arm/mach-at91/Makefile
arch/arm/mach-integrator/cpu.c
arch/arm/mach-integrator/impd1.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-integrator/pci_v3.c
arch/arm/mach-iop32x/n2100.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-realview/core.c
arch/arm/mach-u300/mmc.c
arch/arm/mach-versatile/core.c
arch/arm/mm/Kconfig
arch/arm/mm/alignment.c
arch/arm/mm/cache-l2x0.c
arch/arm/mm/fault-armv.c
arch/arm/mm/init.c
arch/arm/mm/mmu.c
arch/arm/plat-nomadik/gpio.c
arch/arm/plat-pxa/Makefile
drivers/usb/gadget/at91_udc.c