Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20
Christoph's block pnfs patches have some minor dependencies on these lock patches.
Showing
- .mailmap 1 addition, 0 deletions.mailmap
- Documentation/networking/ip-sysctl.txt 2 additions, 0 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/target/tcm_mod_builder.py 12 additions, 37 deletionsDocumentation/target/tcm_mod_builder.py
- Documentation/thermal/cpu-cooling-api.txt 13 additions, 2 deletionsDocumentation/thermal/cpu-cooling-api.txt
- MAINTAINERS 19 additions, 8 deletionsMAINTAINERS
- Makefile 2 additions, 1 deletionMakefile
- arch/arm/boot/dts/imx6sx-sdb.dts 15 additions, 0 deletionsarch/arm/boot/dts/imx6sx-sdb.dts
- arch/arm/boot/dts/vf610-twr.dts 15 additions, 0 deletionsarch/arm/boot/dts/vf610-twr.dts
- arch/arm/include/uapi/asm/unistd.h 1 addition, 0 deletionsarch/arm/include/uapi/asm/unistd.h
- arch/arm/kernel/calls.S 1 addition, 0 deletionsarch/arm/kernel/calls.S
- arch/arm/kernel/perf_regs.c 8 additions, 0 deletionsarch/arm/kernel/perf_regs.c
- arch/arm/mm/dump.c 2 additions, 7 deletionsarch/arm/mm/dump.c
- arch/arm/mm/init.c 2 additions, 2 deletionsarch/arm/mm/init.c
- arch/arm/mm/mmu.c 2 additions, 2 deletionsarch/arm/mm/mmu.c
- arch/arm64/include/asm/arch_timer.h 1 addition, 0 deletionsarch/arm64/include/asm/arch_timer.h
- arch/arm64/include/asm/cpu.h 5 additions, 0 deletionsarch/arm64/include/asm/cpu.h
- arch/arm64/include/asm/kvm_emulate.h 2 additions, 0 deletionsarch/arm64/include/asm/kvm_emulate.h
- arch/arm64/include/asm/processor.h 1 addition, 3 deletionsarch/arm64/include/asm/processor.h
- arch/arm64/include/asm/unistd.h 1 addition, 1 deletionarch/arm64/include/asm/unistd.h
- arch/arm64/kernel/cpuinfo.c 10 additions, 0 deletionsarch/arm64/kernel/cpuinfo.c
Loading
Please register or sign in to comment