Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Convert ia64 to use int-ll64.h
  [IA64] Fix build error in paravirt_patchlist.c
  [IA64] ia64 does not need umount2() syscall
  [IA64] hook up new rt_tgsigqueueinfo syscall
  [IA64] msi_ia64.c dmar_msi_type should be static
  [IA64] remove obsolete hw_interrupt_type
  [IA64] remove obsolete irq_desc_t typedef
  [IA64] remove obsolete no_irq_type
  [IA64] unexport fpswa.h

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 183ac3fe44fb..9c7e2343c399 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -518,8 +518,9 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
         if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa))
                 return AE_OK;
 
-        printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset (ioc=%lx, lba=%lx)\n",
-                (char *) context, sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa);
+        printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset "
+                "(ioc=%llx, lba=%llx)\n", (char *)context,
+                sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa);
 
         hp_zx1_gart_found = 1;
         return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index 58e9f8e457f8..51e0e2d8fac6 100644
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
@@ -28,10 +28,10 @@ setup_serial_console(struct pcdp_uart *uart)
         char parity;
 
         mmio = (uart->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY);
-        p += sprintf(p, "uart8250,%s,0x%lx",
+        p += sprintf(p, "uart8250,%s,0x%llx",
                 mmio ? "mmio" : "io", uart->addr.address);
         if (uart->baud) {
-                p += sprintf(p, ",%lu", uart->baud);
+                p += sprintf(p, ",%llu", uart->baud);
                 if (uart->bits) {
                         switch (uart->parity) {
                             case 0x2: parity = 'e'; break;