Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c
No related branches found
No related tags found
Showing
- Documentation/RCU/stallwarn.txt 71 additions, 23 deletionsDocumentation/RCU/stallwarn.txt
- Documentation/RCU/torture.txt 0 additions, 10 deletionsDocumentation/RCU/torture.txt
- Documentation/RCU/trace.txt 19 additions, 16 deletionsDocumentation/RCU/trace.txt
- Documentation/intel_txt.txt 9 additions, 7 deletionsDocumentation/intel_txt.txt
- Documentation/kernel-parameters.txt 7 additions, 1 deletionDocumentation/kernel-parameters.txt
- Documentation/kprobes.txt 2 additions, 8 deletionsDocumentation/kprobes.txt
- Documentation/rbtree.txt 58 additions, 0 deletionsDocumentation/rbtree.txt
- Documentation/scheduler/sched-design-CFS.txt 3 additions, 51 deletionsDocumentation/scheduler/sched-design-CFS.txt
- Documentation/scheduler/sched-rt-group.txt 4 additions, 16 deletionsDocumentation/scheduler/sched-rt-group.txt
- Documentation/trace/events.txt 2 additions, 1 deletionDocumentation/trace/events.txt
- Documentation/trace/ftrace.txt 48 additions, 2 deletionsDocumentation/trace/ftrace.txt
- Documentation/trace/kprobetrace.txt 3 additions, 1 deletionDocumentation/trace/kprobetrace.txt
- MAINTAINERS 18 additions, 6 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/Kconfig 13 additions, 7 deletionsarch/Kconfig
- arch/alpha/include/asm/atomic.h 2 additions, 2 deletionsarch/alpha/include/asm/atomic.h
- arch/alpha/include/asm/bitops.h 10 additions, 8 deletionsarch/alpha/include/asm/bitops.h
- arch/arm/include/asm/atomic.h 1 addition, 1 deletionarch/arm/include/asm/atomic.h
- arch/arm/include/asm/cacheflush.h 4 additions, 0 deletionsarch/arm/include/asm/cacheflush.h
- arch/arm/include/asm/smp_twd.h 17 additions, 0 deletionsarch/arm/include/asm/smp_twd.h
Loading
Please register or sign in to comment