Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/mtd/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/mtd/Makefile
Simple merge

diff --cc drivers/mtd/devices/block2mtd.c
Simple merge

diff --cc drivers/mtd/devices/sst25l.c
Simple merge

diff --cc drivers/mtd/lpddr/lpddr_cmds.c
Simple merge

diff --cc drivers/mtd/maps/bfin-async-flash.c
Simple merge

diff --cc drivers/mtd/maps/physmap_of.c
Simple merge

diff --cc drivers/mtd/maps/pismo.c
Simple merge

diff --cc drivers/mtd/mtdcore.c
index 70a78587c3c072521d1a1ed70464f6c473d31f15,b177e750efc364b91b646a81d9fa9570cfec5430..3ae06c8935b5b286f2b418d7e928fc2a90dc740c
--- 1/drivers/mtd/mtdcore.c
--- 2/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@@ -17,12 -19,39 +19,40 @@@
  #include <linux/init.h>
  #include <linux/mtd/compatmac.h>
  #include <linux/proc_fs.h>
 +#include <linux/idr.h>
+ #include <linux/backing-dev.h>
  
  #include <linux/mtd/mtd.h>
- #include "internal.h"
  
  #include "mtdcore.h"
+ /*
+  * backing device capabilities for non-mappable devices (such as NAND flash)
+  * - permits private mappings, copies are taken of the data
+  */
+ struct backing_dev_info mtd_bdi_unmappable = {
+       .capabilities   = BDI_CAP_MAP_COPY,
+ };
+ 
+ /*
+  * backing device capabilities for R/O mappable devices (such as ROM)
+  * - permits private mappings, copies are taken of the data
+  * - permits non-writable shared mappings
+  */
+ struct backing_dev_info mtd_bdi_ro_mappable = {
+       .capabilities   = (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |
+                          BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP),
+ };
+ 
+ /*
+  * backing device capabilities for writable mappable devices (such as RAM)
+  * - permits private mappings, copies are taken of the data
+  * - permits non-writable shared mappings
+  */
+ struct backing_dev_info mtd_bdi_rw_mappable = {
+       .capabilities   = (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |
+                          BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP |
+                          BDI_CAP_WRITE_MAP),
+ };
  
  static int mtd_cls_suspend(struct device *dev, pm_message_t state);
  static int mtd_cls_resume(struct device *dev);

diff --cc drivers/mtd/mtdsuper.c
Simple merge

diff --cc drivers/mtd/nand/bcm_umi_nand.c
Simple merge

diff --cc drivers/mtd/nand/cafe_nand.c
Simple merge

diff --cc drivers/mtd/nand/davinci_nand.c
Simple merge

diff --cc drivers/mtd/nand/fsl_upm.c
Simple merge

diff --cc drivers/mtd/nand/nomadik_nand.c
Simple merge

diff --cc drivers/mtd/nand/omap2.c
Simple merge

diff --cc drivers/mtd/nand/orion_nand.c
Simple merge

diff --cc drivers/mtd/nand/pxa3xx_nand.c
Simple merge

diff --cc drivers/mtd/nand/sh_flctl.c
Simple merge

diff --cc drivers/mtd/nand/tmio_nand.c
Simple merge

diff --cc drivers/mtd/onenand/omap2.c
Simple merge