Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc32: Delete prom_stdin and prom_stdout. sparc32: More memory probing consolidation. sparc32: Kill totally unused memory information tables. sparc64: Fix syscall restart, for real... serial: Fix sparc driver name strings. sparc64: Stop creating dummy root PCI host controller devices.
Showing
- arch/sparc/kernel/setup.c 1 addition, 4 deletionsarch/sparc/kernel/setup.c
- arch/sparc/mm/fault.c 6 additions, 55 deletionsarch/sparc/mm/fault.c
- arch/sparc/prom/init.c 0 additions, 7 deletionsarch/sparc/prom/init.c
- arch/sparc/prom/memory.c 60 additions, 175 deletionsarch/sparc/prom/memory.c
- arch/sparc64/kernel/pci.c 33 additions, 97 deletionsarch/sparc64/kernel/pci.c
- arch/sparc64/kernel/pci_common.c 0 additions, 6 deletionsarch/sparc64/kernel/pci_common.c
- arch/sparc64/kernel/pci_impl.h 0 additions, 9 deletionsarch/sparc64/kernel/pci_impl.h
- arch/sparc64/kernel/process.c 0 additions, 6 deletionsarch/sparc64/kernel/process.c
- arch/sparc64/kernel/signal.c 5 additions, 1 deletionarch/sparc64/kernel/signal.c
- arch/sparc64/kernel/signal32.c 6 additions, 0 deletionsarch/sparc64/kernel/signal32.c
- drivers/serial/sunhv.c 1 addition, 1 deletiondrivers/serial/sunhv.c
- drivers/serial/sunsab.c 1 addition, 1 deletiondrivers/serial/sunsab.c
- drivers/serial/sunsu.c 1 addition, 1 deletiondrivers/serial/sunsu.c
- drivers/serial/sunzilog.c 1 addition, 1 deletiondrivers/serial/sunzilog.c
- include/asm-sparc/oplib.h 0 additions, 17 deletionsinclude/asm-sparc/oplib.h
- include/asm-sparc/page.h 2 additions, 3 deletionsinclude/asm-sparc/page.h
Loading
Please register or sign in to comment