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

Conflicts:
	drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-ep93xx/include/mach/ts72xx.h
Simple merge

diff --cc arch/arm/mach-ep93xx/ts72xx.c
Simple merge

diff --cc drivers/mtd/inftlcore.c
index 015a7fe1b6ee3a92390da0cd12667b3634c49f6d,8aca5523a3370fd916595e146d2ed9df4c4d9de2..015a7fe1b6ee3a92390da0cd12667b3634c49f6d
mode 100755,100644..100644
--- 1/drivers/mtd/inftlcore.c
--- 2/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c

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

diff --cc drivers/mtd/nand/Kconfig
index 226206e06230f16d93a6f4609d74249d1f30b84e,42e5ea49e97504adc1e354c7e9534e1c3054aed6..164bd56b9d1a9c1f748dc824947a72e800e53671
--- 1/drivers/mtd/nand/Kconfig
--- 2/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -452,16 -442,9 +452,16 @@@ config MTD_NAND_FSL_UP
          Enables support for NAND Flash chips wired onto Freescale PowerPC
          processor localbus with User-Programmable Machine support.
  
 +config MTD_NAND_MPC5121_NFC
 +      tristate "MPC5121 built-in NAND Flash Controller support"
 +      depends on PPC_MPC512x
 +      help
 +        This enables the driver for the NAND flash controller on the
 +        MPC5121 SoC.
 +
  config MTD_NAND_MXC
        tristate "MXC NAND support"
-       depends on ARCH_MX2 || ARCH_MX3
+       depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3
        help
          This enables the driver for the NAND flash controller on the
          MXC processors.

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

diff --cc drivers/mtd/nand/bcm_umi_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/sh_flctl.c
index dbc09a81866e078c41c2d0d07a07986718aafe2b,1842df8bdd934fcec9955f445984af556ebf13bb..88c802cd947f5326e183b9aa24d62ee015f8ccdf
--- 1/drivers/mtd/nand/sh_flctl.c
--- 2/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@@ -825,7 -849,12 +849,12 @@@ static int __devinit flctl_probe(struc
        nand->select_chip = flctl_select_chip;
        nand->cmdfunc = flctl_cmdfunc;
  
 -      ret = nand_scan_ident(flctl_mtd, 1);
+       if (pdata->flcmncr_val & SEL_16BIT) {
+               nand->options |= NAND_BUSWIDTH_16;
+               nand->read_word = flctl_read_word;
+       }
+ 
 +      ret = nand_scan_ident(flctl_mtd, 1, NULL);
        if (ret)
                goto err;
  

diff --cc lib/idr.c
Simple merge