Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: 
Ingo Molnar <mingo@elte.hu>
No related branches found
No related tags found
Showing
- Documentation/RCU/whatisRCU.txt 31 additions, 0 deletionsDocumentation/RCU/whatisRCU.txt
- Documentation/devicetree/bindings/i2c/ce4100-i2c.txt 93 additions, 0 deletionsDocumentation/devicetree/bindings/i2c/ce4100-i2c.txt
- Documentation/devicetree/bindings/rtc/rtc-cmos.txt 28 additions, 0 deletionsDocumentation/devicetree/bindings/rtc/rtc-cmos.txt
- Documentation/devicetree/bindings/x86/ce4100.txt 38 additions, 0 deletionsDocumentation/devicetree/bindings/x86/ce4100.txt
- Documentation/devicetree/bindings/x86/interrupt.txt 26 additions, 0 deletionsDocumentation/devicetree/bindings/x86/interrupt.txt
- Documentation/devicetree/bindings/x86/timer.txt 6 additions, 0 deletionsDocumentation/devicetree/bindings/x86/timer.txt
- Documentation/devicetree/booting-without-of.txt 20 additions, 0 deletionsDocumentation/devicetree/booting-without-of.txt
- Documentation/kernel-parameters.txt 4 additions, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/memory-barriers.txt 58 additions, 0 deletionsDocumentation/memory-barriers.txt
- Documentation/rtc.txt 10 additions, 19 deletionsDocumentation/rtc.txt
- Documentation/spinlocks.txt 1 addition, 23 deletionsDocumentation/spinlocks.txt
- Documentation/trace/ftrace-design.txt 7 additions, 0 deletionsDocumentation/trace/ftrace-design.txt
- Documentation/trace/ftrace.txt 23 additions, 128 deletionsDocumentation/trace/ftrace.txt
- Documentation/trace/kprobetrace.txt 15 additions, 1 deletionDocumentation/trace/kprobetrace.txt
- arch/alpha/include/asm/fcntl.h 2 additions, 0 deletionsarch/alpha/include/asm/fcntl.h
- arch/alpha/include/asm/futex.h 16 additions, 13 deletionsarch/alpha/include/asm/futex.h
- arch/alpha/include/asm/rwsem.h 0 additions, 36 deletionsarch/alpha/include/asm/rwsem.h
- arch/alpha/kernel/osf_sys.c 8 additions, 28 deletionsarch/alpha/kernel/osf_sys.c
- arch/alpha/kernel/time.c 2 additions, 6 deletionsarch/alpha/kernel/time.c
- arch/arm/include/asm/futex.h 14 additions, 15 deletionsarch/arm/include/asm/futex.h
Loading
Please register or sign in to comment