diff options
author | Olof Johansson <olof@lixom.net> | 2014-05-29 13:39:43 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-05-29 13:39:43 -0700 |
commit | 8320857b1d168fd17d7cee48bbfd04aaf6797be8 (patch) | |
tree | 58b31d3d9514df93974216f190824d73f9816d9f /arch/parisc/kernel/syscall_table.S | |
parent | 263c08af44741697202b85e631a964ee85200eb0 (diff) | |
parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) |
Merge tag 'v3.15-rc6' into next/defconfig
Linux 3.15-rc6
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
-rw-r--r-- | arch/parisc/kernel/syscall_table.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 83ead0ea127d..f1432da7b4c0 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -432,6 +432,7 @@ ENTRY_SAME(sched_setattr) ENTRY_SAME(sched_getattr) /* 335 */ ENTRY_COMP(utimes) + ENTRY_COMP(renameat2) /* Nothing yet */ |