commit | ad0b40fa944628d6f30b40266a599b285d70a266 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 29 16:16:12 2016 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 29 16:16:12 2016 -0800 |
tree | 988262db8c25a94dbacf0312330df81668b0bb83 | |
parent | ec1cc55d6fa0b34029419634125fadc77dce1e88 [diff] | |
parent | 03590cb56d5df7367ccb9e6e0127593254401c42 [diff] |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm Pull ARM fixes from Russell King: "Just one fix for a -fstack-protector-strong problem from Kees Cook, and adding the new copy_file_range syscall" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: wire up copy_file_range() syscall ARM: 8500/1: fix atags_to_fdt with stack-protector-strong