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

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/bcm63xx/boards/board_bcm963xx.c
Simple merge

diff --cc arch/mips/kernel/perf_event_mipsxx.c
index 315fc0b250f8fe3373684f12f5c0437fd3d0b7b1,bda4bc9e6988bcab40f6b5513748c861d7a0adec..e3b897acfbc04b3db1cbd29a37a423ccca4df815
--- 1/arch/mips/kernel/perf_event_mipsxx.c
--- 2/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@@ -731,16 -710,16 +710,16 @@@ static int validate_group(struct perf_e
  
        memset(&fake_cpuc, 0, sizeof(fake_cpuc));
  
-       if (!validate_event(&fake_cpuc, leader))
+       if (mipsxx_pmu_alloc_counter(&fake_cpuc, &leader->hw) < 0)
 -              return -ENOSPC;
 +              return -EINVAL;
  
        list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
-               if (!validate_event(&fake_cpuc, sibling))
+               if (mipsxx_pmu_alloc_counter(&fake_cpuc, &sibling->hw) < 0)
 -                      return -ENOSPC;
 +                      return -EINVAL;
        }
  
-       if (!validate_event(&fake_cpuc, event))
+       if (mipsxx_pmu_alloc_counter(&fake_cpuc, &event->hw) < 0)
 -              return -ENOSPC;
 +              return -EINVAL;
  
        return 0;
  }

diff --cc arch/mips/kernel/setup.c
Simple merge

diff --cc arch/mips/kernel/traps.c
index bbddb86c1fa159bc50dc9275b38a1754353ede43,48240fd8c29716f1ad3581b46788b3ae762dd15d..cc4a3f120f54d6f036e66812cf47e5c35e7dbff9
--- 1/arch/mips/kernel/traps.c
--- 2/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@@ -1339,9 -1340,18 +1340,18 @@@ void ejtag_exception_handler(struct pt_
  
  /*
   * NMI exception handler.
+  * No lock; only written during early bootup by CPU 0.
   */
 -NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
+ static RAW_NOTIFIER_HEAD(nmi_chain);
+ 
+ int register_nmi_notifier(struct notifier_block *nb)
+ {
+       return raw_notifier_chain_register(&nmi_chain, nb);
+ }
+ 
 +void __noreturn nmi_exception_handler(struct pt_regs *regs)
  {
+       raw_notifier_call_chain(&nmi_chain, 0, regs);
        bust_spinlocks(1);
        printk("NMI taken!!!!\n");
        die("NMI", regs);

diff --cc arch/mips/pci/pci.c
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/Makefile
index 07e0494c68307b25406fb753c4369456c1d031e3,76811cc58591d98fc830663371c2441e03a5c87a..f5b01f2ce525da8df92d1972529fefb70c98ae23
--- 1/drivers/tty/serial/Makefile
--- 2/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -90,4 -94,4 +90,5 @@@ obj-$(CONFIG_SERIAL_MSM_SMD)  += msm_smd
  obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
  obj-$(CONFIG_SERIAL_LANTIQ)   += lantiq.o
  obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
 +obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o
+ obj-$(CONFIG_SERIAL_AR933X)   += ar933x_uart.o

diff --cc drivers/usb/host/Kconfig
Simple merge

diff --cc drivers/usb/host/ohci-au1xxx.c
Simple merge

diff --cc include/linux/serial_core.h
Simple merge

diff --cc sound/soc/au1x/db1200.c
index 1c629393df782b5d866241ec9c2eded166df2bfe,44ad118273644b32f7110132cbd409a182f53c26..30ea513d81d730cefa1027be46726a1c69e8df5f
--- 1/sound/soc/au1x/db1200.c
--- 2/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@@ -135,8 -202,19 +204,8 @@@ static struct platform_driver db1200_au
        .remove         = __devexit_p(db1200_audio_remove),
  };
  
 -static int __init db1200_audio_load(void)
 -{
 -      return platform_driver_register(&db1200_audio_driver);
 -}
 -
 -static void __exit db1200_audio_unload(void)
 -{
 -      platform_driver_unregister(&db1200_audio_driver);
 -}
 -
 -module_init(db1200_audio_load);
 -module_exit(db1200_audio_unload);
 +module_platform_driver(db1200_audio_driver);
  
  MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("DB1200 ASoC audio support");
+ MODULE_DESCRIPTION("DB1200/DB1300/DB1550 ASoC audio support");
  MODULE_AUTHOR("Manuel Lauss");