Merge branch 'devel-stable' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Sep 2009 11:02:26 +0000 (12:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Sep 2009 11:02:26 +0000 (12:02 +0100)
commitddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3
treed827bca3fc825a0ac33efbcd493713be40fcc812
parentcf7a2b4fb6a9b86779930a0a123b0df41aa9208f
parentf17a1f06d2fa93f4825be572622eb02c4894db4e
Merge branch 'devel-stable' into devel

Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
14 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/include/asm/ftrace.h
arch/arm/kernel/entry-common.S
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-omap2/mcbsp.c
arch/arm/mach-realview/core.c
arch/arm/mach-versatile/core.c
arch/arm/mm/fault.c
arch/arm/mm/proc-macros.S
drivers/mmc/host/mmci.c
drivers/net/Kconfig
drivers/video/Kconfig