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] Ignore vmlinux.lds generated files [MIPS] kgdb: Do not call fixup_exception [MIPS] RB532: Do not define registers that are already defined [MIPS] IP27: Export symbol pcibus_to_node to modules. [MIPS] kgdb: s/(void *)0)/NULL/ [MIPS] kgdb: smp_call_function's 3rd argument is a pointer. [MIPS] TXx9: Fix mips_hpt_frequency initialization [MIPS] emma2rh: Fix build error by header file inclusion weeding. [MIPS] Jazz: Fix build error by header file inclusion weeding. [MIPS] Wire up new syscalls. [MIPS] Convert printk statements during kernel setup to use severity levels
Showing
- arch/mips/emma2rh/markeins/setup.c 1 addition, 15 deletionsarch/mips/emma2rh/markeins/setup.c
- arch/mips/jazz/setup.c 1 addition, 12 deletionsarch/mips/jazz/setup.c
- arch/mips/kernel/.gitignore 1 addition, 0 deletionsarch/mips/kernel/.gitignore
- arch/mips/kernel/kgdb.c 2 additions, 5 deletionsarch/mips/kernel/kgdb.c
- arch/mips/kernel/scall32-o32.S 6 additions, 0 deletionsarch/mips/kernel/scall32-o32.S
- arch/mips/kernel/scall64-64.S 6 additions, 0 deletionsarch/mips/kernel/scall64-64.S
- arch/mips/kernel/scall64-n32.S 6 additions, 0 deletionsarch/mips/kernel/scall64-n32.S
- arch/mips/kernel/scall64-o32.S 6 additions, 0 deletionsarch/mips/kernel/scall64-o32.S
- arch/mips/kernel/setup.c 20 additions, 22 deletionsarch/mips/kernel/setup.c
- arch/mips/pci/pci-ip27.c 1 addition, 0 deletionsarch/mips/pci/pci-ip27.c
- arch/mips/rb532/devices.c 3 additions, 13 deletionsarch/mips/rb532/devices.c
- arch/mips/txx9/generic/setup.c 3 additions, 0 deletionsarch/mips/txx9/generic/setup.c
- include/asm-mips/unistd.h 24 additions, 6 deletionsinclude/asm-mips/unistd.h
Loading
Please register or sign in to comment