Commit 7bf6612e8a9d6a0b3b82e8e2611942be1258b307
11 parents
7a5c3b8c5c
f77138e8d5
b606d5ae90
b15a6d62b5
df0ac8a406
876f116618
d7a887a73d
6457a396bb
5611cc4572
ff5d7265cf
b3ea581834
Exists in
master
and in
6 other branches
Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cav…
…ium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 249 changed files Side-by-side Diff
- arch/mips/Kconfig
- arch/mips/Makefile
- arch/mips/ar7/gpio.c
- arch/mips/ar7/platform.c
- arch/mips/ar7/prom.c
- arch/mips/ath79/Kconfig
- arch/mips/ath79/Makefile
- arch/mips/ath79/clock.c
- arch/mips/ath79/common.c
- arch/mips/ath79/dev-ar913x-wmac.c
- arch/mips/ath79/dev-ar913x-wmac.h
- arch/mips/ath79/dev-common.c
- arch/mips/ath79/dev-usb.c
- arch/mips/ath79/dev-usb.h
- arch/mips/ath79/dev-wmac.c
- arch/mips/ath79/dev-wmac.h
- arch/mips/ath79/early_printk.c
- arch/mips/ath79/gpio.c
- arch/mips/ath79/irq.c
- arch/mips/ath79/mach-ap121.c
- arch/mips/ath79/mach-ap81.c
- arch/mips/ath79/mach-pb44.c
- arch/mips/ath79/mach-ubnt-xm.c
- arch/mips/ath79/machtypes.h
- arch/mips/ath79/setup.c
- arch/mips/bcm63xx/Kconfig
- arch/mips/bcm63xx/boards/board_bcm963xx.c
- arch/mips/bcm63xx/clk.c
- arch/mips/bcm63xx/cpu.c
- arch/mips/bcm63xx/dev-uart.c
- arch/mips/bcm63xx/gpio.c
- arch/mips/bcm63xx/irq.c
- arch/mips/bcm63xx/prom.c
- arch/mips/bcm63xx/setup.c
- arch/mips/cavium-octeon/Kconfig
- arch/mips/cavium-octeon/dma-octeon.c
- arch/mips/cavium-octeon/executive/Makefile
- arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
- arch/mips/cavium-octeon/executive/cvmx-fpa.c
- arch/mips/cavium-octeon/executive/cvmx-helper-board.c
- arch/mips/cavium-octeon/executive/cvmx-helper-fpa.c
- arch/mips/cavium-octeon/executive/cvmx-helper-loop.c
- arch/mips/cavium-octeon/executive/cvmx-helper-npi.c
- arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
- arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
- arch/mips/cavium-octeon/executive/cvmx-helper-spi.c
- arch/mips/cavium-octeon/executive/cvmx-helper-util.c
- arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
- arch/mips/cavium-octeon/executive/cvmx-helper.c
- arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
- arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c
- arch/mips/cavium-octeon/executive/cvmx-pko.c
- arch/mips/cavium-octeon/executive/cvmx-spi.c
- arch/mips/cavium-octeon/executive/octeon-model.c
- arch/mips/configs/nlm_xlp_defconfig
- arch/mips/configs/nlm_xlr_defconfig
- arch/mips/include/asm/bmips.h
- arch/mips/include/asm/branch.h
- arch/mips/include/asm/cpu.h
- arch/mips/include/asm/hazards.h
- arch/mips/include/asm/kprobes.h
- arch/mips/include/asm/mach-ath79/ar71xx_regs.h
- arch/mips/include/asm/mach-ath79/ar933x_uart.h
- arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
- arch/mips/include/asm/mach-ath79/ath79.h
- arch/mips/include/asm/mach-ath79/irq.h
- arch/mips/include/asm/mach-ath79/pci-ath724x.h
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- arch/mips/include/asm/mach-bcm63xx/ioremap.h
- arch/mips/include/asm/mach-bcm63xx/irq.h
- arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
- arch/mips/include/asm/mipsregs.h
- arch/mips/include/asm/module.h
- arch/mips/include/asm/netlogic/common.h
- arch/mips/include/asm/netlogic/haldefs.h
- arch/mips/include/asm/netlogic/xlp-hal/bridge.h
- arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h
- arch/mips/include/asm/netlogic/xlp-hal/iomap.h
- arch/mips/include/asm/netlogic/xlp-hal/pic.h
- arch/mips/include/asm/netlogic/xlp-hal/sys.h
- arch/mips/include/asm/netlogic/xlp-hal/uart.h
- arch/mips/include/asm/netlogic/xlp-hal/xlp.h
- arch/mips/include/asm/netlogic/xlr/iomap.h
- arch/mips/include/asm/netlogic/xlr/msidef.h
- arch/mips/include/asm/netlogic/xlr/pic.h
- arch/mips/include/asm/netlogic/xlr/xlr.h
- arch/mips/include/asm/octeon/cvmx-address.h
- arch/mips/include/asm/octeon/cvmx-asxx-defs.h
- arch/mips/include/asm/octeon/cvmx-bootinfo.h
- arch/mips/include/asm/octeon/cvmx-cmd-queue.h
- arch/mips/include/asm/octeon/cvmx-config.h
- arch/mips/include/asm/octeon/cvmx-dbg-defs.h
- arch/mips/include/asm/octeon/cvmx-dpi-defs.h
- arch/mips/include/asm/octeon/cvmx-fau.h
- arch/mips/include/asm/octeon/cvmx-fpa-defs.h
- arch/mips/include/asm/octeon/cvmx-fpa.h
- arch/mips/include/asm/octeon/cvmx-gmxx-defs.h
- arch/mips/include/asm/octeon/cvmx-helper-board.h
- arch/mips/include/asm/octeon/cvmx-helper-fpa.h
- arch/mips/include/asm/octeon/cvmx-helper-loop.h
- arch/mips/include/asm/octeon/cvmx-helper-npi.h
- arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
- arch/mips/include/asm/octeon/cvmx-helper-sgmii.h
- arch/mips/include/asm/octeon/cvmx-helper-spi.h
- arch/mips/include/asm/octeon/cvmx-helper-util.h
- arch/mips/include/asm/octeon/cvmx-helper-xaui.h
- arch/mips/include/asm/octeon/cvmx-helper.h
- arch/mips/include/asm/octeon/cvmx-ipd.h
- arch/mips/include/asm/octeon/cvmx-mdio.h
- arch/mips/include/asm/octeon/cvmx-mio-defs.h
- arch/mips/include/asm/octeon/cvmx-npei-defs.h
- arch/mips/include/asm/octeon/cvmx-pciercx-defs.h
- arch/mips/include/asm/octeon/cvmx-pcsx-defs.h
- arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h
- arch/mips/include/asm/octeon/cvmx-pemx-defs.h
- arch/mips/include/asm/octeon/cvmx-pexp-defs.h
- arch/mips/include/asm/octeon/cvmx-pip-defs.h
- arch/mips/include/asm/octeon/cvmx-pip.h
- arch/mips/include/asm/octeon/cvmx-pko-defs.h
- arch/mips/include/asm/octeon/cvmx-pko.h
- arch/mips/include/asm/octeon/cvmx-pow.h
- arch/mips/include/asm/octeon/cvmx-scratch.h
- arch/mips/include/asm/octeon/cvmx-sli-defs.h
- arch/mips/include/asm/octeon/cvmx-spi.h
- arch/mips/include/asm/octeon/cvmx-spxx-defs.h
- arch/mips/include/asm/octeon/cvmx-sriox-defs.h
- arch/mips/include/asm/octeon/cvmx-srxx-defs.h
- arch/mips/include/asm/octeon/cvmx-stxx-defs.h
- arch/mips/include/asm/octeon/cvmx-wqe.h
- arch/mips/include/asm/octeon/cvmx.h
- arch/mips/include/asm/octeon/octeon-feature.h
- arch/mips/include/asm/octeon/octeon-model.h
- arch/mips/include/asm/octeon/pci-octeon.h
- arch/mips/include/asm/traps.h
- arch/mips/kernel/Makefile
- arch/mips/kernel/bmips_vec.S
- arch/mips/kernel/branch.c
- arch/mips/kernel/cpu-probe.c
- arch/mips/kernel/kprobes.c
- arch/mips/kernel/perf_event_mipsxx.c
- arch/mips/kernel/smp-bmips.c
- arch/mips/kernel/traps.c
- arch/mips/lib/Makefile
- arch/mips/math-emu/cp1emu.c
- arch/mips/mm/Makefile
- arch/mips/mm/c-r4k.c
- arch/mips/netlogic/Kconfig
- arch/mips/netlogic/Makefile
- arch/mips/netlogic/Platform
- arch/mips/netlogic/common/Makefile
- arch/mips/netlogic/common/earlycons.c
- arch/mips/netlogic/common/irq.c
- arch/mips/netlogic/common/smp.c
- arch/mips/netlogic/common/smpboot.S
- arch/mips/netlogic/common/time.c
- arch/mips/netlogic/xlp/Makefile
- arch/mips/netlogic/xlp/nlm_hal.c
- arch/mips/netlogic/xlp/platform.c
- arch/mips/netlogic/xlp/setup.c
- arch/mips/netlogic/xlp/wakeup.c
- arch/mips/netlogic/xlr/Makefile
- arch/mips/netlogic/xlr/irq.c
- arch/mips/netlogic/xlr/platform.c
- arch/mips/netlogic/xlr/setup.c
- arch/mips/netlogic/xlr/smp.c
- arch/mips/netlogic/xlr/smpboot.S
- arch/mips/netlogic/xlr/time.c
- arch/mips/netlogic/xlr/wakeup.c
- arch/mips/netlogic/xlr/xlr_console.c
- arch/mips/pci/Makefile
- arch/mips/pci/pci-ath724x.c
- arch/mips/pci/pci-bcm63xx.c
- arch/mips/pci/pci-octeon.c
- arch/mips/pci/pci-xlr.c
- arch/mips/pci/pcie-octeon.c
- drivers/staging/octeon/Makefile
- drivers/staging/octeon/cvmx-address.h
- drivers/staging/octeon/cvmx-asxx-defs.h
- drivers/staging/octeon/cvmx-cmd-queue.c
- drivers/staging/octeon/cvmx-cmd-queue.h
- drivers/staging/octeon/cvmx-config.h
- drivers/staging/octeon/cvmx-dbg-defs.h
- drivers/staging/octeon/cvmx-fau.h
- drivers/staging/octeon/cvmx-fpa-defs.h
- drivers/staging/octeon/cvmx-fpa.c
- drivers/staging/octeon/cvmx-fpa.h
- drivers/staging/octeon/cvmx-gmxx-defs.h
- drivers/staging/octeon/cvmx-helper-board.c
- drivers/staging/octeon/cvmx-helper-board.h
- drivers/staging/octeon/cvmx-helper-fpa.c
- drivers/staging/octeon/cvmx-helper-fpa.h
- drivers/staging/octeon/cvmx-helper-loop.c
- drivers/staging/octeon/cvmx-helper-loop.h
- drivers/staging/octeon/cvmx-helper-npi.c
- drivers/staging/octeon/cvmx-helper-npi.h
- drivers/staging/octeon/cvmx-helper-rgmii.c
- drivers/staging/octeon/cvmx-helper-rgmii.h
- drivers/staging/octeon/cvmx-helper-sgmii.c
- drivers/staging/octeon/cvmx-helper-sgmii.h
- drivers/staging/octeon/cvmx-helper-spi.c
- drivers/staging/octeon/cvmx-helper-spi.h
- drivers/staging/octeon/cvmx-helper-util.c
- drivers/staging/octeon/cvmx-helper-util.h
- drivers/staging/octeon/cvmx-helper-xaui.c
- drivers/staging/octeon/cvmx-helper-xaui.h
- drivers/staging/octeon/cvmx-helper.c
- drivers/staging/octeon/cvmx-helper.h
- drivers/staging/octeon/cvmx-interrupt-decodes.c
- drivers/staging/octeon/cvmx-interrupt-rsl.c
- drivers/staging/octeon/cvmx-ipd.h
- drivers/staging/octeon/cvmx-mdio.h
- drivers/staging/octeon/cvmx-packet.h
- drivers/staging/octeon/cvmx-pcsx-defs.h
- drivers/staging/octeon/cvmx-pcsxx-defs.h
- drivers/staging/octeon/cvmx-pip-defs.h
- drivers/staging/octeon/cvmx-pip.h
- drivers/staging/octeon/cvmx-pko-defs.h
- drivers/staging/octeon/cvmx-pko.c
- drivers/staging/octeon/cvmx-pko.h
- drivers/staging/octeon/cvmx-pow.h
- drivers/staging/octeon/cvmx-scratch.h
- drivers/staging/octeon/cvmx-smix-defs.h
- drivers/staging/octeon/cvmx-spi.c
- drivers/staging/octeon/cvmx-spi.h
- drivers/staging/octeon/cvmx-spxx-defs.h
- drivers/staging/octeon/cvmx-srxx-defs.h
- drivers/staging/octeon/cvmx-stxx-defs.h
- drivers/staging/octeon/cvmx-wqe.h
- drivers/staging/octeon/ethernet-defines.h
- drivers/staging/octeon/ethernet-mdio.c
- drivers/staging/octeon/ethernet-mem.c
- drivers/staging/octeon/ethernet-rgmii.c
- drivers/staging/octeon/ethernet-rx.c
- drivers/staging/octeon/ethernet-rx.h
- drivers/staging/octeon/ethernet-sgmii.c
- drivers/staging/octeon/ethernet-spi.c
- drivers/staging/octeon/ethernet-tx.c
- drivers/staging/octeon/ethernet-xaui.c
- drivers/staging/octeon/ethernet.c
- drivers/tty/serial/Kconfig
- drivers/tty/serial/Makefile
- drivers/tty/serial/ar933x_uart.c
- drivers/usb/host/Kconfig
- drivers/usb/host/ehci-ath79.c
- include/linux/serial_core.h