Merge branch 'master' into for-2.6.31
Conflicts:
drivers/ide/ide-io.c
Signed-off-by:
Jens Axboe <jens.axboe@oracle.com>
Showing
- Documentation/filesystems/tmpfs.txt 1 addition, 1 deletionDocumentation/filesystems/tmpfs.txt
- Documentation/networking/ip-sysctl.txt 12 additions, 3 deletionsDocumentation/networking/ip-sysctl.txt
- MAINTAINERS 8 additions, 0 deletionsMAINTAINERS
- arch/arm/Kconfig 3 additions, 3 deletionsarch/arm/Kconfig
- arch/arm/common/gic.c 2 additions, 2 deletionsarch/arm/common/gic.c
- arch/arm/include/asm/hardware/gic.h 1 addition, 1 deletionarch/arm/include/asm/hardware/gic.h
- arch/arm/include/asm/smp.h 4 additions, 8 deletionsarch/arm/include/asm/smp.h
- arch/arm/kernel/smp.c 16 additions, 30 deletionsarch/arm/kernel/smp.c
- arch/arm/mach-ep93xx/clock.c 61 additions, 8 deletionsarch/arm/mach-ep93xx/clock.c
- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h 4 additions, 1 deletionarch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
- arch/arm/mach-integrator/core.c 1 addition, 1 deletionarch/arm/mach-integrator/core.c
- arch/arm/mach-l7200/include/mach/sys-clock.h 1 addition, 1 deletionarch/arm/mach-l7200/include/mach/sys-clock.h
- arch/arm/mach-omap2/clock24xx.c 5 additions, 5 deletionsarch/arm/mach-omap2/clock24xx.c
- arch/arm/mach-omap2/clock34xx.c 6 additions, 6 deletionsarch/arm/mach-omap2/clock34xx.c
- arch/arm/mach-omap2/clock34xx.h 6 additions, 6 deletionsarch/arm/mach-omap2/clock34xx.h
- arch/arm/mach-omap2/devices.c 4 additions, 2 deletionsarch/arm/mach-omap2/devices.c
- arch/arm/mach-omap2/prm-regbits-34xx.h 1 addition, 1 deletionarch/arm/mach-omap2/prm-regbits-34xx.h
- arch/arm/mach-omap2/usb-tusb6010.c 1 addition, 1 deletionarch/arm/mach-omap2/usb-tusb6010.c
- arch/arm/mach-pxa/viper.c 1 addition, 0 deletionsarch/arm/mach-pxa/viper.c
- arch/arm/mach-realview/core.c 0 additions, 8 deletionsarch/arm/mach-realview/core.c
Loading
Please register or sign in to comment