Commit f2c60ed038dedcc43a0eb3ef4e0602741ba90384
Exists in
master
and in
7 other branches
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (28 commits) [MIPS] Rework cobalt_board_id [MIPS] Use RTC_CMOS for Cobalt [MIPS] Use platform_device for Cobalt UART [MIPS] Separate Alchemy processor based boards config [MIPS] Fix build error in atomic64_cmpxchg [MIPS] Run checksyscalls for N32 and O32 ABI [MIPS] tlbex: use __maybe_unused [MIPS] excite: use __maybe_unused [MIPS] Add extern cobalt_board_id [MIPS] Remove unused CONFIG_TOSHIBA_BOARDS [MIPS] Rename tb0229_defconfig to tb0219_defconfig [MIPS] Update tb0229_defconfig; add CONFIG_GPIO_TB0219. [MIPS] Add minimum defconfig for RBHMA4200 [MIPS] SB1: Build fix. [MIPS] Drop __devinit tag from allocate_irqno() and free_irqno() [MIPS] clocksource: use CLOCKSOURCE_MASK() macro [MIPS] Remove LIMITED_DMA support [MIPS] Remove Momenco Jaguar ATX support [MIPS] Remove Momenco Ocelot G support [MIPS] FPU hazard handling ...
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.
If you still want to see the diff click this link
Showing 73 changed files Side-by-side Diff
- Documentation/mips/pci/pci.README
- arch/mips/Kconfig
- arch/mips/Makefile
- arch/mips/au1000/Kconfig
- arch/mips/basler/excite/excite_device.c
- arch/mips/cobalt/Makefile
- arch/mips/cobalt/rtc.c
- arch/mips/cobalt/serial.c
- arch/mips/cobalt/setup.c
- arch/mips/configs/cobalt_defconfig
- arch/mips/configs/db1000_defconfig
- arch/mips/configs/db1100_defconfig
- arch/mips/configs/db1200_defconfig
- arch/mips/configs/db1500_defconfig
- arch/mips/configs/db1550_defconfig
- arch/mips/configs/jaguar-atx_defconfig
- arch/mips/configs/jmr3927_defconfig
- arch/mips/configs/ocelot_g_defconfig
- arch/mips/configs/pb1100_defconfig
- arch/mips/configs/pb1500_defconfig
- arch/mips/configs/pb1550_defconfig
- arch/mips/configs/rbhma4200_defconfig
- arch/mips/configs/rbhma4500_defconfig
- arch/mips/configs/tb0219_defconfig
- arch/mips/configs/tb0229_defconfig
- arch/mips/kernel/early_printk.c
- arch/mips/kernel/irq-msc01.c
- arch/mips/kernel/irq.c
- arch/mips/kernel/time.c
- arch/mips/kernel/traps.c
- arch/mips/lib/Makefile
- arch/mips/lib/ucmpdi2.c
- arch/mips/mips-boards/malta/malta_int.c
- arch/mips/mm/highmem.c
- arch/mips/mm/init.c
- arch/mips/mm/tlbex.c
- arch/mips/momentum/Kconfig
- arch/mips/momentum/jaguar_atx/Makefile
- arch/mips/momentum/jaguar_atx/dbg_io.c
- arch/mips/momentum/jaguar_atx/irq.c
- arch/mips/momentum/jaguar_atx/ja-console.c
- arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h
- arch/mips/momentum/jaguar_atx/platform.c
- arch/mips/momentum/jaguar_atx/prom.c
- arch/mips/momentum/jaguar_atx/reset.c
- arch/mips/momentum/jaguar_atx/setup.c
- arch/mips/momentum/ocelot_g/Makefile
- arch/mips/momentum/ocelot_g/dbg_io.c
- arch/mips/momentum/ocelot_g/gt-irq.c
- arch/mips/momentum/ocelot_g/irq.c
- arch/mips/momentum/ocelot_g/ocelot_pld.h
- arch/mips/momentum/ocelot_g/prom.c
- arch/mips/momentum/ocelot_g/reset.c
- arch/mips/momentum/ocelot_g/setup.c
- arch/mips/pci/Makefile
- arch/mips/pci/fixup-cobalt.c
- arch/mips/pci/fixup-jaguar.c
- arch/mips/pci/fixup-ocelot-g.c
- arch/mips/pci/pci-ocelot-g.c
- drivers/rtc/Kconfig
- include/asm-mips/atomic.h
- include/asm-mips/bootinfo.h
- include/asm-mips/fpu.h
- include/asm-mips/hazards.h
- include/asm-mips/highmem.h
- include/asm-mips/mach-cobalt/cobalt.h
- include/asm-mips/mach-ja/cpu-feature-overrides.h
- include/asm-mips/mach-ja/spaces.h
- include/asm-mips/mips-boards/malta.h
- include/asm-mips/msc01_ic.h
- include/asm-mips/page.h
- include/asm-mips/serial.h
- include/asm-mips/system.h