linux/arch/mips/sgi-ip27
Linus Torvalds 4964e0664c 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
2012-01-14 13:05:21 -08:00
..
ip27-berr.c MIPS: Stop using <asm-generic/int-l64.h>. 2009-03-30 14:49:41 +02:00
ip27-console.c
ip27-hubio.c MIPS: IP27: Fix GCC 4.6.0 build error. 2011-05-10 18:15:25 +01:00
ip27-init.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ip27-irq.c Merge branch 'next/generic' into mips-for-linux-next 2012-01-11 15:41:47 +01:00
ip27-klconfig.c MIPS: IP27: klconfig.c checkpatch cleanup 2010-08-05 13:25:44 +01:00
ip27-klnuma.c MIPS: IP27: Fix GCC 4.6.0 build error. 2011-05-10 18:15:25 +01:00
ip27-memory.c mips: Use HAVE_MEMBLOCK_NODE_MAP 2011-12-08 10:22:09 -08:00
ip27-nmi.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
ip27-reset.c
ip27-smp.c MIPS: SMP: Fix build. 2009-09-30 21:47:00 +02:00
ip27-timer.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
ip27-xtalk.c MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users. 2009-06-24 18:34:39 +01:00
Kconfig treewide: remove commented out Kconfig entries 2011-10-29 21:31:21 +02:00
Makefile MIPS: IP27: Migrate to new Platform file 2010-08-05 13:25:47 +01:00
Platform MIPS: IP27: Migrate to new Platform file 2010-08-05 13:25:47 +01:00
TODO Fix common misspellings 2011-03-31 11:26:23 -03:00