Merge ../linux-2.6
Showing
- Documentation/sysrq.txt 35 additions, 31 deletionsDocumentation/sysrq.txt
- MAINTAINERS 1 addition, 7 deletionsMAINTAINERS
- arch/i386/boot/compressed/relocs.c 2 additions, 0 deletionsarch/i386/boot/compressed/relocs.c
- arch/i386/mach-default/setup.c 1 addition, 1 deletionarch/i386/mach-default/setup.c
- arch/sparc/kernel/smp.c 4 additions, 4 deletionsarch/sparc/kernel/smp.c
- arch/sparc/kernel/sun4d_smp.c 1 addition, 1 deletionarch/sparc/kernel/sun4d_smp.c
- drivers/char/sysrq.c 11 additions, 9 deletionsdrivers/char/sysrq.c
- drivers/ide/ide.c 4 additions, 4 deletionsdrivers/ide/ide.c
- drivers/ide/pci/via82cxxx.c 1 addition, 1 deletiondrivers/ide/pci/via82cxxx.c
- drivers/kvm/vmx.c 2 additions, 0 deletionsdrivers/kvm/vmx.c
- drivers/net/hamradio/Kconfig 3 additions, 3 deletionsdrivers/net/hamradio/Kconfig
- drivers/pci/quirks.c 5 additions, 3 deletionsdrivers/pci/quirks.c
- drivers/pci/search.c 2 additions, 8 deletionsdrivers/pci/search.c
- fs/nfsd/nfsfh.c 1 addition, 1 deletionfs/nfsd/nfsfh.c
- fs/proc/base.c 11 additions, 1 deletionfs/proc/base.c
- include/asm-frv/Kbuild 6 additions, 0 deletionsinclude/asm-frv/Kbuild
- include/asm-frv/page.h 2 additions, 2 deletionsinclude/asm-frv/page.h
- include/asm-frv/ptrace.h 4 additions, 0 deletionsinclude/asm-frv/ptrace.h
- include/asm-frv/termios.h 2 additions, 0 deletionsinclude/asm-frv/termios.h
- include/asm-um/pgtable.h 9 additions, 0 deletionsinclude/asm-um/pgtable.h
Loading
Please register or sign in to comment