Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (28 commits) MIPS: Add a CONFIG_FORCE_MAX_ZONEORDER Kconfig option. MIPS: LD/SD o32 macro GAS fix update MIPS: Alchemy: fix build with SERIAL_8250=n MIPS: Rename mips_dma_cache_sync back to dma_cache_sync MIPS: MT: Fix typo in comment. SSB: Fix nvram_get on BCM47xx platform MIPS: BCM47xx: Swap serial console if ttyS1 was specified. MIPS: BCM47xx: Use sscanf for parsing mac address MIPS: BCM47xx: Fill values for b43 into SSB sprom MIPS: BCM47xx: Do not read config from CFE MIPS: FDT size is a be32 MIPS: Fix CP0 COUNTER clockevent race MIPS: Fix regression on BCM4710 processor detection MIPS: JZ4740: Fix pcm device name MIPS: Separate two consecutive loads in memset.S MIPS: Send proper signal and siginfo on FP emulator faults. MIPS: AR7: Fix loops per jiffies on TNETD7200 devices MIPS: AR7: Fix double ar7_gpio_init declaration MIPS: Rework GENERIC_HARDIRQS Kconfig. MIPS: Alchemy: Add return value check for strict_strtoul() ...
Showing
- arch/mips/Kconfig 24 additions, 14 deletionsarch/mips/Kconfig
- arch/mips/alchemy/common/platform.c 2 additions, 0 deletionsarch/mips/alchemy/common/platform.c
- arch/mips/alchemy/devboards/prom.c 2 additions, 3 deletionsarch/mips/alchemy/devboards/prom.c
- arch/mips/ar7/clock.c 3 additions, 6 deletionsarch/mips/ar7/clock.c
- arch/mips/ar7/time.c 3 additions, 0 deletionsarch/mips/ar7/time.c
- arch/mips/bcm47xx/setup.c 106 additions, 47 deletionsarch/mips/bcm47xx/setup.c
- arch/mips/include/asm/cpu.h 2 additions, 2 deletionsarch/mips/include/asm/cpu.h
- arch/mips/include/asm/elf.h 6 additions, 2 deletionsarch/mips/include/asm/elf.h
- arch/mips/include/asm/io.h 10 additions, 2 deletionsarch/mips/include/asm/io.h
- arch/mips/include/asm/mach-ar7/ar7.h 1 addition, 2 deletionsarch/mips/include/asm/mach-ar7/ar7.h
- arch/mips/include/asm/mach-bcm47xx/nvram.h 7 additions, 0 deletionsarch/mips/include/asm/mach-bcm47xx/nvram.h
- arch/mips/jz4740/board-qi_lb60.c 2 additions, 2 deletionsarch/mips/jz4740/board-qi_lb60.c
- arch/mips/jz4740/platform.c 1 addition, 1 deletionarch/mips/jz4740/platform.c
- arch/mips/jz4740/prom.c 1 addition, 1 deletionarch/mips/jz4740/prom.c
- arch/mips/kernel/cevt-r4k.c 1 addition, 1 deletionarch/mips/kernel/cevt-r4k.c
- arch/mips/kernel/cpu-probe.c 2 additions, 5 deletionsarch/mips/kernel/cpu-probe.c
- arch/mips/kernel/linux32.c 7 additions, 6 deletionsarch/mips/kernel/linux32.c
- arch/mips/kernel/process.c 0 additions, 1 deletionarch/mips/kernel/process.c
- arch/mips/kernel/prom.c 1 addition, 1 deletionarch/mips/kernel/prom.c
- arch/mips/kernel/smp-mt.c 1 addition, 1 deletionarch/mips/kernel/smp-mt.c
Loading
Please register or sign in to comment