Merge branch 'linus' into tracing/urgent
Merge reason: Merge up to almost-rc6 to pick up latest perfcounters
(on which we'll queue up a dependent fix)
Signed-off-by: 
Ingo Molnar <mingo@elte.hu>
No related branches found
No related tags found
Showing
- CREDITS 6 additions, 0 deletionsCREDITS
- Documentation/ABI/testing/sysfs-block 23 additions, 14 deletionsDocumentation/ABI/testing/sysfs-block
- Documentation/DocBook/kernel-hacking.tmpl 2 additions, 2 deletionsDocumentation/DocBook/kernel-hacking.tmpl
- Documentation/arm/memory.txt 2 additions, 0 deletionsDocumentation/arm/memory.txt
- Documentation/filesystems/sysfs.txt 2 additions, 1 deletionDocumentation/filesystems/sysfs.txt
- Documentation/laptops/thinkpad-acpi.txt 0 additions, 127 deletionsDocumentation/laptops/thinkpad-acpi.txt
- Documentation/lguest/lguest.c 483 additions, 238 deletionsDocumentation/lguest/lguest.c
- Documentation/sysrq.txt 4 additions, 3 deletionsDocumentation/sysrq.txt
- MAINTAINERS 925 additions, 1848 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/boot/compressed/misc.c 0 additions, 1 deletionarch/arm/boot/compressed/misc.c
- arch/arm/common/clkdev.c 1 addition, 0 deletionsarch/arm/common/clkdev.c
- arch/arm/configs/mx27_defconfig 185 additions, 85 deletionsarch/arm/configs/mx27_defconfig
- arch/arm/configs/mx3_defconfig 102 additions, 49 deletionsarch/arm/configs/mx3_defconfig
- arch/arm/configs/omap3_evm_defconfig 1 addition, 1 deletionarch/arm/configs/omap3_evm_defconfig
- arch/arm/include/asm/atomic.h 0 additions, 2 deletionsarch/arm/include/asm/atomic.h
- arch/arm/kernel/entry-common.S 1 addition, 1 deletionarch/arm/kernel/entry-common.S
- arch/arm/kernel/signal.c 2 additions, 2 deletionsarch/arm/kernel/signal.c
- arch/arm/mach-at91/include/mach/at_hdmac.h 102 additions, 0 deletionsarch/arm/mach-at91/include/mach/at_hdmac.h
- arch/arm/mach-davinci/board-dm355-evm.c 0 additions, 1 deletionarch/arm/mach-davinci/board-dm355-evm.c
Loading
Please register or sign in to comment