-
- Downloads
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Showing
- Documentation/arm/00-INDEX 2 additions, 0 deletionsDocumentation/arm/00-INDEX
- Documentation/dvb/README.dvb-usb 25 additions, 25 deletionsDocumentation/dvb/README.dvb-usb
- Documentation/dvb/README.flexcop 1 addition, 1 deletionDocumentation/dvb/README.flexcop
- Documentation/dvb/avermedia.txt 1 addition, 1 deletionDocumentation/dvb/avermedia.txt
- Documentation/dvb/cards.txt 4 additions, 4 deletionsDocumentation/dvb/cards.txt
- Documentation/dvb/contributors.txt 2 additions, 2 deletionsDocumentation/dvb/contributors.txt
- Documentation/dvb/readme.txt 2 additions, 2 deletionsDocumentation/dvb/readme.txt
- Documentation/filesystems/ext3.txt 13 additions, 13 deletionsDocumentation/filesystems/ext3.txt
- MAINTAINERS 5 additions, 5 deletionsMAINTAINERS
- Makefile 3 additions, 3 deletionsMakefile
- arch/alpha/kernel/machvec_impl.h 1 addition, 1 deletionarch/alpha/kernel/machvec_impl.h
- arch/arm/kernel/calls.S 4 additions, 4 deletionsarch/arm/kernel/calls.S
- arch/arm/kernel/entry-armv.S 49 additions, 0 deletionsarch/arm/kernel/entry-armv.S
- arch/arm/kernel/entry-common.S 2 additions, 18 deletionsarch/arm/kernel/entry-common.S
- arch/arm/kernel/module.c 2 additions, 0 deletionsarch/arm/kernel/module.c
- arch/arm/kernel/ptrace.c 9 additions, 0 deletionsarch/arm/kernel/ptrace.c
- arch/arm/mach-pxa/pm.c 5 additions, 4 deletionsarch/arm/mach-pxa/pm.c
- arch/i386/kernel/kprobes.c 1 addition, 1 deletionarch/i386/kernel/kprobes.c
- arch/i386/kernel/smpboot.c 1 addition, 2 deletionsarch/i386/kernel/smpboot.c
- arch/i386/kernel/traps.c 0 additions, 7 deletionsarch/i386/kernel/traps.c
Loading
Please register or sign in to comment