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

diff --cc drivers/mtd/maps/Kconfig
Simple merge

diff --cc drivers/mtd/maps/physmap_of.c
index fbd613968717e7c1d10f0c656f486b0c47031d8b,cf75a566442ed790e70ef062b755bf3581db7afc..aeed9ea79714ab56454840ee34d6eb5395e60f12
--- 1/drivers/mtd/maps/physmap_of.c
--- 2/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@@ -132,15 -225,14 +225,13 @@@ static int __devinit of_flash_probe(str
                goto err_out;
        }
  
-               dev_dbg(&dev->dev, "physmap flash device: %.8llx at %.8llx\n",
-           (unsigned long long)res.end - res.start + 1,
-           (unsigned long long)res.start);
+               dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",
+               (unsigned long long)res.start, (unsigned long long)res.end);
  
-       info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
-       if (info == NULL) {
-               err = -ENOMEM;
+       err = -ENOMEM;
+       info = kzalloc(sizeof(*info), GFP_KERNEL);
+       if (!info)
                goto err_out;
-       }
 -      memset(info, 0, sizeof(*info));
  
        dev_set_drvdata(&dev->dev, info);