merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 24a03152d196..4db2055cee31 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -62,9 +62,10 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)
                 /* Non-CFI userflash device-- once I find one we
                  * can work on supporting it.
                  */
-                printk("%s: unsupported device at 0x%lx (%d regs): " \
+                printk("%s: unsupported device at 0x%llx (%d regs): " \
                         "email ebrower@usa.net\n",
-                       dp->full_name, res->start, edev->num_addrs);
+                       dp->full_name, (unsigned long long)res->start,
+                       edev->num_addrs);
 
                 return -ENODEV;
         }