Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
  MIPS: Delete unused function add_temporary_entry.
  MIPS: Set default pci cache line size.
  MIPS: Flush huge TLB
  MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
  MIPS: Octeon: Add support for OCTEON II PCIe
  MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
  MIPS: Alchemy: Update cpu-feature-overrides
  MIPS: Alchemy: db1200: Improve PB1200 detection.
  MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
  MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
  MIPS: Alchemy: irq: register pm at irq init time
  MIPS: Alchemy: Touchscreen support on DB1100
  MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
  net/irda: convert au1k_ir to platform driver.
  MIPS: Alchemy: remove unused board headers
  MTD: nand: make au1550nd.c a platform_driver
  MIPS: Netlogic: Mark Netlogic chips as SMT capable
  MIPS: Netlogic: Add support for XLP 3XX cores
  MIPS: Netlogic: Merge some of XLR/XLP wakup code
  MIPS: Netlogic: Add default XLP config.
  ...

Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile

1 files changed, 6 insertions, 7 deletions

diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
index f9737bb3c5ab..d673731c538a 100644
--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
@@ -240,7 +240,6 @@ out:
 
 static struct irqaction cascade = {
         .handler = no_action,
-        .flags = IRQF_DISABLED,
         .name = "cascade",
 };
 
@@ -249,28 +248,28 @@ void __init arch_init_irq(void)
         int i;
 
         if (insert_resource(&iomem_resource, &ltq_icu_resource) < 0)
-                panic("Failed to insert icu memory\n");
+                panic("Failed to insert icu memory");
 
         if (request_mem_region(ltq_icu_resource.start,
                         resource_size(&ltq_icu_resource), "icu") < 0)
-                panic("Failed to request icu memory\n");
+                panic("Failed to request icu memory");
 
         ltq_icu_membase = ioremap_nocache(ltq_icu_resource.start,
                                 resource_size(&ltq_icu_resource));
         if (!ltq_icu_membase)
-                panic("Failed to remap icu memory\n");
+                panic("Failed to remap icu memory");
 
         if (insert_resource(&iomem_resource, &ltq_eiu_resource) < 0)
-                panic("Failed to insert eiu memory\n");
+                panic("Failed to insert eiu memory");
 
         if (request_mem_region(ltq_eiu_resource.start,
                         resource_size(&ltq_eiu_resource), "eiu") < 0)
-                panic("Failed to request eiu memory\n");
+                panic("Failed to request eiu memory");
 
         ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start,
                                 resource_size(&ltq_eiu_resource));
         if (!ltq_eiu_membase)
-                panic("Failed to remap eiu memory\n");
+                panic("Failed to remap eiu memory");
 
         /* make sure all irqs are turned off by default */
         for (i = 0; i < 5; i++)