Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux...

UAPI Disintegration 2012-10-09

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 e81f17a,e5165a8..a0bf848
--- 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
@@@ -456,7 -461,10 +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/mtdcore.c
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 df1ab7d,f1deb1e..945047a
--- 1/drivers/mtd/nand/davinci_nand.c
--- 2/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@@ -33,10 -33,9 +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 9ee436d,131b58a..aefaf8c
--- 1/drivers/mtd/nand/orion_nand.c
--- 2/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@@ -21,7 -21,8 +21,7 @@@
  #include <linux/err.h>
  #include <asm/io.h>
  #include <asm/sizes.h>
- #include <plat/orion_nand.h>
 -#include <mach/hardware.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 792cee8,d804061..295e4be
--- 1/drivers/mtd/nand/s3c2410.c
--- 2/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@@ -46,9 -43,24 +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