diff options
| author | Linus Torvalds <[email protected]> | 2016-01-30 00:16:12 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-01-30 00:16:12 +0000 |
| commit | ad0b40fa944628d6f30b40266a599b285d70a266 (patch) | |
| tree | 988262db8c25a94dbacf0312330df81668b0bb83 /fs/btrfs/dev-replace.c | |
| parent | Merge tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
| parent | ARM: wire up copy_file_range() syscall (diff) | |
| download | kernel-ad0b40fa944628d6f30b40266a599b285d70a266.tar.gz kernel-ad0b40fa944628d6f30b40266a599b285d70a266.zip | |
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
Diffstat (limited to 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions