Merge remote-tracking branch 'mtd/master'

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c

diff --cc arch/arm/boot/dts/imx51.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx53.dtsi
Simple merge

diff --cc arch/arm/mach-imx/clk-imx51-imx53.c
index e5165a84f93f7ff8467f5b7c981a083518fffff4,e81f17a70f0092574410c731454c09f9bce84c84..a0bf84803eacee45978fc1b1deef41076db17f19
--- 1/arch/arm/mach-imx/clk-imx51-imx53.c
--- 2/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@@ -461,10 -456,7 +462,11 @@@ int __init mx53_clocks_init(unsigned lo
        clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi");
        clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi");
        clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi");
+       clk_register_clkdev(clk[nfc_gate], NULL, "63fdb000.nand");
 +      clk_register_clkdev(clk[can1_ipg_gate], "ipg", "53fc8000.can");
 +      clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can");
 +      clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can");
 +      clk_register_clkdev(clk[can2_serial_gate], "per", "53fcc000.can");
  
        /* set SDHC root clock to 200MHZ*/
        clk_set_rate(clk[esdhc_a_podf], 200000000);

diff --cc arch/powerpc/configs/mpc83xx_defconfig
Simple merge

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

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

diff --cc drivers/mtd/nand/ams-delta.c
Simple merge

diff --cc drivers/mtd/nand/davinci_nand.c
index f1deb1ee2c954c2a15a0c8a60aaf91bc0c9eccb9,df1ab7dc3440876f8d99014f57cadd64dee81b88..945047ad09527ca6a9328f34866ddd5a3a7e7dd8
--- 1/drivers/mtd/nand/davinci_nand.c
--- 2/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@@ -33,9 -33,10 +33,10 @@@
  #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
  #include <linux/slab.h>
+ #include <linux/of_device.h>
  
 -#include <mach/nand.h>
 -#include <mach/aemif.h>
 +#include <linux/platform_data/mtd-davinci.h>
 +#include <linux/platform_data/mtd-davinci-aemif.h>
  
  /*
   * This is a device driver for the NAND flash controller found on the

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

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

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

diff --cc drivers/mtd/nand/orion_nand.c
index 131b58a133f148b2f70cdb711c708f529d84c87d,9ee436d309329fd04464cd6643b343ab1f1e5b88..aefaf8cd31ef86f802e09273760fb47638067292
--- 1/drivers/mtd/nand/orion_nand.c
--- 2/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@@ -21,8 -21,7 +21,7 @@@
  #include <linux/err.h>
  #include <asm/io.h>
  #include <asm/sizes.h>
- #include <mach/hardware.h>
 -#include <plat/orion_nand.h>
 +#include <linux/platform_data/mtd-orion_nand.h>
  
  static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
  {

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

diff --cc drivers/mtd/nand/s3c2410.c
index d8040619ad8dfca48fc460305b782cc771a06008,792cee8462219626732982daa7b8849b9783b666..295e4bedad960a0efe653dc893fe0f1e0270f2f1
--- 1/drivers/mtd/nand/s3c2410.c
--- 2/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@@ -43,24 -46,9 +46,9 @@@
  #include <linux/mtd/nand_ecc.h>
  #include <linux/mtd/partitions.h>
  
- #include <asm/io.h>
- 
  #include <plat/regs-nand.h>
 -#include <plat/nand.h>
 +#include <linux/platform_data/mtd-nand-s3c2410.h>
  
- #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
- static int hardware_ecc = 1;
- #else
- static int hardware_ecc = 0;
- #endif
- 
- #ifdef CONFIG_MTD_NAND_S3C2410_CLKSTOP
- static const int clock_stop = 1;
- #else
- static const int clock_stop = 0;
- #endif
- 
- 
  /* new oob placement block for use with hardware ecc generation
   */
  

diff --cc fs/jffs2/super.c
Simple merge