Merge commit 'v2.6.37' into for-2.6.38-incoming
I made a slight mess of Documentation/filesystems/Locking; resolve conflicts with upstream before fixing it up.
Showing
- Documentation/accounting/getdelays.c 1 addition, 0 deletionsDocumentation/accounting/getdelays.c
- Documentation/filesystems/Locking 100 additions, 112 deletionsDocumentation/filesystems/Locking
- Documentation/kernel-parameters.txt 1 addition, 6 deletionsDocumentation/kernel-parameters.txt
- Documentation/power/runtime_pm.txt 2 additions, 2 deletionsDocumentation/power/runtime_pm.txt
- Documentation/scsi/scsi_mid_low_api.txt 31 additions, 28 deletionsDocumentation/scsi/scsi_mid_low_api.txt
- Documentation/trace/postprocess/trace-vmscan-postprocess.pl 10 additions, 1 deletionDocumentation/trace/postprocess/trace-vmscan-postprocess.pl
- MAINTAINERS 18 additions, 3 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/common/it8152.c 1 addition, 0 deletionsarch/arm/common/it8152.c
- arch/arm/include/asm/hardware/it8152.h 1 addition, 0 deletionsarch/arm/include/asm/hardware/it8152.h
- arch/arm/include/asm/highmem.h 0 additions, 3 deletionsarch/arm/include/asm/highmem.h
- arch/arm/include/asm/sizes.h 3 additions, 3 deletionsarch/arm/include/asm/sizes.h
- arch/arm/include/asm/system.h 1 addition, 0 deletionsarch/arm/include/asm/system.h
- arch/arm/kernel/entry-common.S 6 additions, 0 deletionsarch/arm/kernel/entry-common.S
- arch/arm/kernel/smp.c 0 additions, 1 deletionarch/arm/kernel/smp.c
- arch/arm/mach-at91/Makefile 1 addition, 1 deletionarch/arm/mach-at91/Makefile
- arch/arm/mach-at91/board-pcontrol-g20.c 3 additions, 95 deletionsarch/arm/mach-at91/board-pcontrol-g20.c
- arch/arm/mach-at91/board-stamp9g20.c 43 additions, 39 deletionsarch/arm/mach-at91/board-stamp9g20.c
- arch/arm/mach-at91/clock.c 1 addition, 1 deletionarch/arm/mach-at91/clock.c
- arch/arm/mach-at91/include/mach/at91_mci.h 2 additions, 0 deletionsarch/arm/mach-at91/include/mach/at91_mci.h
Loading
Please register or sign in to comment