4964e0664c
* '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
|
||
|---|---|---|
| .. | ||
| fixup-bcm63xx.c | ||
| fixup-capcella.c | ||
| fixup-cobalt.c | ||
| fixup-emma2rh.c | ||
| fixup-fuloong2e.c | ||
| fixup-ip32.c | ||
| fixup-jmr3927.c | ||
| fixup-lemote2f.c | ||
| fixup-malta.c | ||
| fixup-mpc30x.c | ||
| fixup-pmcmsp.c | ||
| fixup-pnx8550.c | ||
| fixup-rbtx4927.c | ||
| fixup-rbtx4938.c | ||
| fixup-rc32434.c | ||
| fixup-sb1250.c | ||
| fixup-sni.c | ||
| fixup-tb0219.c | ||
| fixup-tb0226.c | ||
| fixup-tb0287.c | ||
| fixup-wrppmc.c | ||
| fixup-yosemite.c | ||
| Makefile | ||
| msi-octeon.c | ||
| ops-bcm63xx.c | ||
| ops-bonito64.c | ||
| ops-bridge.c | ||
| ops-emma2rh.c | ||
| ops-gt64xxx_pci0.c | ||
| ops-lantiq.c | ||
| ops-loongson2.c | ||
| ops-mace.c | ||
| ops-msc.c | ||
| ops-nile4.c | ||
| ops-pmcmsp.c | ||
| ops-pnx8550.c | ||
| ops-rc32434.c | ||
| ops-sni.c | ||
| ops-titan-ht.c | ||
| ops-titan.c | ||
| ops-tx3927.c | ||
| ops-tx4927.c | ||
| ops-vr41xx.c | ||
| pci-alchemy.c | ||
| pci-ath724x.c | ||
| pci-bcm47xx.c | ||
| pci-bcm63xx.c | ||
| pci-bcm63xx.h | ||
| pci-bcm1480.c | ||
| pci-bcm1480ht.c | ||
| pci-emma2rh.c | ||
| pci-ip27.c | ||
| pci-ip32.c | ||
| pci-lantiq.c | ||
| pci-lantiq.h | ||
| pci-lasat.c | ||
| pci-octeon.c | ||
| pci-rc32434.c | ||
| pci-sb1250.c | ||
| pci-tx4927.c | ||
| pci-tx4938.c | ||
| pci-tx4939.c | ||
| pci-vr41xx.c | ||
| pci-vr41xx.h | ||
| pci-xlr.c | ||
| pci-yosemite.c | ||
| pci.c | ||
| pcie-octeon.c | ||