Merge branch 'master' into next
Conflicts:
fs/exec.c
Removed IMA changes (the IMA checks are now performed via may_open()).
Signed-off-by: 
James Morris <jmorris@namei.org>
Showing
- Documentation/ABI/testing/sysfs-kernel-slab 479 additions, 0 deletionsDocumentation/ABI/testing/sysfs-kernel-slab
- Documentation/DocBook/kgdb.tmpl 1 addition, 1 deletionDocumentation/DocBook/kgdb.tmpl
- Documentation/networking/ip-sysctl.txt 12 additions, 3 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/sysctl/vm.txt 0 additions, 28 deletionsDocumentation/sysctl/vm.txt
- Documentation/sysfs-rules.txt 1 addition, 1 deletionDocumentation/sysfs-rules.txt
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/include/asm/percpu.h 25 additions, 1 deletionarch/alpha/include/asm/percpu.h
- 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-davinci/include/mach/asp.h 25 additions, 0 deletionsarch/arm/mach-davinci/include/mach/asp.h
- 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-ixp4xx/ixp4xx_npe.c 1 addition, 1 deletionarch/arm/mach-ixp4xx/ixp4xx_npe.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
Loading
Please register or sign in to comment