git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 17 May 2010 16:24:04 +0000 (17:24 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 17 May 2010 16:24:04 +0000 (17:24 +0100)
commit	ac1d426e825ab5778995f2f6f053ca2e6b45c622
tree	75b91356ca39463e0112931aa6790802fb1e07a2	tree \| snapshot (tar.gz zip)
parent	fda0e18c8a7a3e02747c2b045b4fcd2c920410b9	commit \| diff
parent	a3685f00652af83f12b63e3b4ef48f29581ba48b	commit \| diff

Merge branch 'devel-stable' into devel

Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig

26 files changed:

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

Motorola kernel-slsi

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