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: Outline udelay and fix a few issues. MIPS: ioctl.h: Fix headers_check warnings MIPS: Cobalt: PCI bus is always required to obtain the board ID MIPS: Kconfig: Remove "Support for" from Cavium system type MIPS: Sibyte: Honor CONFIG_CMDLINE SSB: BCM47xx: Export ssb_watchdog_timer_set
Showing
- arch/mips/Kconfig 3 additions, 2 deletionsarch/mips/Kconfig
- arch/mips/include/asm/cpu-info.h 2 additions, 2 deletionsarch/mips/include/asm/cpu-info.h
- arch/mips/include/asm/delay.h 5 additions, 87 deletionsarch/mips/include/asm/delay.h
- arch/mips/include/asm/ioctl.h 4 additions, 0 deletionsarch/mips/include/asm/ioctl.h
- arch/mips/kernel/proc.c 1 addition, 1 deletionarch/mips/kernel/proc.c
- arch/mips/lib/Makefile 2 additions, 2 deletionsarch/mips/lib/Makefile
- arch/mips/lib/delay.c 56 additions, 0 deletionsarch/mips/lib/delay.c
- arch/mips/sibyte/cfe/setup.c 1 addition, 7 deletionsarch/mips/sibyte/cfe/setup.c
- drivers/ssb/embedded.c 1 addition, 0 deletionsdrivers/ssb/embedded.c
Loading
Please register or sign in to comment