Merge branch 'devel-stable' into devel

Conflicts:
	MAINTAINERS
	arch/arm/mm/fault.c

diff --cc MAINTAINERS
index 7b91c6e,33d0ec4..ed6a103
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -603,36 -534,13 +534,33 @@@ L:      linux-arm-kernel@lists.arm.linux.org
  W:    http://maxim.org.za/at91_26.html
  S:    Maintained
  
- P:    Leo Chen <leochen@broadcom.com>
- P:    Scott Branden <sbranden@broadcom.com>
 +ARM/BCMRING ARM ARCHITECTURE
- P:    Leo Chen <leochen@broadcom.com>
- P:    Scott Branden <sbranden@broadcom.com>
++M:    Leo Chen <leochen@broadcom.com>
++M:    Scott Branden <sbranden@broadcom.com>
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +S:    Maintained
 +F:    arch/arm/mach-bcmring
 +
 +ARM/BCMRING MTD NAND DRIVER
++M:    Leo Chen <leochen@broadcom.com>
++M:    Scott Branden <sbranden@broadcom.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/bcm_umi_nand.c
 +F:    drivers/mtd/nand/bcm_umi_bch.c
 +F:    drivers/mtd/nand/bcm_umi_hamming.c
 +F:    drivers/mtd/nand/nand_bcm_umi.h
 +
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
- P:    Hartley Sweeten
- M:    hsweeten@visionengravers.com
- P:    Ryan Mallon
- M:    ryan@bluewatersys.com
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
++M:    Hartley Sweeten <hsweeten@visionengravers.com>
++M:    Ryan Mallon <ryan@bluewatersys.com>
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
 +F:    arch/arm/mach-ep93xx/
 +F:    arch/arm/mach-ep93xx/include/mach/
  
  ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
- P:    Lennert Buytenhek
- M:    kernel@wantstofly.org
+ M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/include/asm/ftrace.h
Simple merge

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/arm/mach-integrator/integrator_cp.c
Simple merge

diff --cc arch/arm/mach-omap2/mcbsp.c
Simple merge

diff --cc arch/arm/mach-realview/core.c
Simple merge

diff --cc arch/arm/mach-versatile/core.c
Simple merge

diff --cc arch/arm/mm/fault.c
index 5fa8dea,556c8da..cc8829d
--- 1/arch/arm/mm/fault.c
--- 2/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@@ -16,7 -16,7 +16,8 @@@
  #include <linux/kprobes.h>
  #include <linux/uaccess.h>
  #include <linux/page-flags.h>
+ #include <linux/sched.h>
 +#include <linux/highmem.h>
  
  #include <asm/system.h>
  #include <asm/pgtable.h>

diff --cc arch/arm/mm/proc-macros.S
Simple merge

diff --cc drivers/mmc/host/mmci.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/video/Kconfig
Simple merge