Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

Some manual fixups for clashing kfree() cleanups etc.

diff --cc drivers/mtd/chips/cfi_cmdset_0001.c
Simple merge

diff --cc drivers/mtd/chips/cfi_cmdset_0002.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/mtd/maps/ixp4xx.c
index 0d87c02dee046f32070427b8e743ac550fa1f8ed,471553a3da69fa6f25edbf688fe9075b1addec1a..56b3a355bf7b83f934a77eeca368b2cdfa25d96c
--- 1/drivers/mtd/maps/ixp4xx.c
--- 2/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@@ -121,10 -114,11 +114,10 @@@ static int ixp4xx_flash_remove(struct d
                del_mtd_partitions(info->mtd);
                map_destroy(info->mtd);
        }
-       if (info->map.map_priv_1)
-               iounmap((void *) info->map.map_priv_1);
+       if (info->map.virt)
+               iounmap(info->map.virt);
  
 -      if (info->partitions)
 -              kfree(info->partitions);
 +      kfree(info->partitions);
  
        if (info->res) {
                release_resource(info->res);

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

diff --cc drivers/mtd/maps/omap-toto-flash.c
Simple merge

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

diff --cc drivers/mtd/maps/sun_uflash.c
index 1355c28f90a4d7432a59171a9622dfc710a92dea,47941fbe74f6654e0a734fa0de44324dffcde5ae..0758cb1d01056568dfda74d55297f7e9a6daa791
--- 1/drivers/mtd/maps/sun_uflash.c
--- 2/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@@ -166,9 -166,11 +166,9 @@@ static void __exit uflash_cleanup(void
                        iounmap(udev->map.virt);
                        udev->map.virt = NULL;
                }
 -              if(0 != udev->name) {
 -                      kfree(udev->name);
 -              }
 +              kfree(udev->name);
                kfree(udev);
-       }       
+       }
  }
  
  module_init(uflash_init);

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

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

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

diff --cc fs/Kconfig
Simple merge

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