aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2014-06-29 13:40:08 -0700
committerLinus Torvalds2014-06-29 13:40:08 -0700
commitef2e0391e531832eea96ed31cba5a131bdfe4149 (patch)
treec2e281387229046f763375c17aff42f0e14c81a1 /Makefile
parent97be078b87f82e49b3e7a46fa71e07b7829838d3 (diff)
parent42309ab450b608ddcfafa90e4cfa93a5001ecfba (diff)
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "Another round of ARM fixes. The largest change here is the L2 changes to work around problems for the Armada 37x/380 devices, where most of the size comes down to comments rather than code. The other significant fix here is for the ptrace code, to ensure that rewritten syscalls work as intended. This was pointed out by Kees Cook, but Will Deacon reworked the patch to be more elegant. The remainder are fairly trivial changes" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8087/1: ptrace: reload syscall number after secure_computing() check ARM: 8086/1: Set memblock limit for nommu ARM: 8085/1: sa1100: collie: add top boot mtd partition ARM: 8084/1: sa1100: collie: revert back to cfi_probe ARM: 8080/1: mcpm.h: remove unused variable declaration ARM: 8076/1: mm: add support for HW coherent systems in PL310 cache
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions