Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Workaround for a sparse warning in include/asm-mips/mach-tx4927/ioremap.h [MIPS] Make show_code static and add __user tag [MIPS] Workaround for a sparse warning in include/asm-mips/compat.h [MIPS] Add some __user tags [MIPS] math-emu minor cleanup [MIPS] Kill CONFIG_TX4927BUG_WORKAROUND [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_FB_XPERT98 [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_SRC_CLK [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_USE32K [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1XXX_PSC_SPI [CHAR] Delete leftovers of old Alchemy UART driver
Showing
- arch/mips/au1000/common/setup.c 0 additions, 6 deletionsarch/mips/au1000/common/setup.c
- arch/mips/au1000/common/time.c 0 additions, 29 deletionsarch/mips/au1000/common/time.c
- arch/mips/au1000/pb1200/board_setup.c 1 addition, 8 deletionsarch/mips/au1000/pb1200/board_setup.c
- arch/mips/kernel/branch.c 3 additions, 2 deletionsarch/mips/kernel/branch.c
- arch/mips/kernel/traps.c 4 additions, 4 deletionsarch/mips/kernel/traps.c
- arch/mips/math-emu/cp1emu.c 9 additions, 10 deletionsarch/mips/math-emu/cp1emu.c
- arch/mips/math-emu/dsemul.c 6 additions, 6 deletionsarch/mips/math-emu/dsemul.c
- arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 0 additions, 19 deletionsarch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
- drivers/char/Kconfig 0 additions, 14 deletionsdrivers/char/Kconfig
- include/asm-mips/compat.h 2 additions, 1 deletioninclude/asm-mips/compat.h
- include/asm-mips/mach-tx49xx/ioremap.h 2 additions, 1 deletioninclude/asm-mips/mach-tx49xx/ioremap.h
Loading
Please register or sign in to comment