From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 12 Sep 2009 11:02:26 +0000 (+0100)
Subject: Merge branch 'devel-stable' into devel
X-Git-Tag: v2.6.32-rc1~691^2~1
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3

Merge branch 'devel-stable' into devel

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

ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3
diff --cc MAINTAINERS
index 7b91c6e,33d0ec4..ed6a103
--- a/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
  
 +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
- 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-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/mm/fault.c
index 5fa8dea,556c8da..cc8829d
--- a/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>