Merge commit 'v2.6.36-rc7' into perf/core
Conflicts:
arch/x86/kernel/module.c
Merge reason: Resolve the conflict, pick up fixes.
Signed-off-by: 
Ingo Molnar <mingo@elte.hu>
No related branches found
No related tags found
Showing
- CREDITS 4 additions, 4 deletionsCREDITS
- MAINTAINERS 27 additions, 11 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/kernel/entry.S 7 additions, 13 deletionsarch/alpha/kernel/entry.S
- arch/alpha/kernel/process.c 1 addition, 1 deletionarch/alpha/kernel/process.c
- arch/alpha/kernel/signal.c 15 additions, 41 deletionsarch/alpha/kernel/signal.c
- arch/alpha/kernel/systbls.S 1 addition, 1 deletionarch/alpha/kernel/systbls.S
- arch/arm/Kconfig 26 additions, 1 deletionarch/arm/Kconfig
- arch/arm/boot/compressed/Makefile 1 addition, 1 deletionarch/arm/boot/compressed/Makefile
- arch/arm/common/it8152.c 8 additions, 0 deletionsarch/arm/common/it8152.c
- arch/arm/include/asm/pgtable.h 4 additions, 0 deletionsarch/arm/include/asm/pgtable.h
- arch/arm/kernel/entry-common.S 2 additions, 0 deletionsarch/arm/kernel/entry-common.S
- arch/arm/mach-at91/at91sam9g45_devices.c 2 additions, 2 deletionsarch/arm/mach-at91/at91sam9g45_devices.c
- arch/arm/mach-davinci/dm355.c 1 addition, 2 deletionsarch/arm/mach-davinci/dm355.c
- arch/arm/mach-davinci/dm365.c 1 addition, 2 deletionsarch/arm/mach-davinci/dm365.c
- arch/arm/mach-davinci/dm644x.c 1 addition, 2 deletionsarch/arm/mach-davinci/dm644x.c
- arch/arm/mach-davinci/dm646x.c 1 addition, 2 deletionsarch/arm/mach-davinci/dm646x.c
- arch/arm/mach-dove/include/mach/io.h 3 additions, 3 deletionsarch/arm/mach-dove/include/mach/io.h
- arch/arm/mach-ixp4xx/common-pci.c 8 additions, 0 deletionsarch/arm/mach-ixp4xx/common-pci.c
- arch/arm/mach-ixp4xx/include/mach/hardware.h 2 additions, 0 deletionsarch/arm/mach-ixp4xx/include/mach/hardware.h
Loading
Please register or sign in to comment