Commit c79d5ff0 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fix from Russell King:
 "Just one change to add the statx syscall this time around"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: wire up statx syscall
parents f89406ca a1016e94
...@@ -411,3 +411,4 @@ ...@@ -411,3 +411,4 @@
394 common pkey_mprotect sys_pkey_mprotect 394 common pkey_mprotect sys_pkey_mprotect
395 common pkey_alloc sys_pkey_alloc 395 common pkey_alloc sys_pkey_alloc
396 common pkey_free sys_pkey_free 396 common pkey_free sys_pkey_free
397 common statx sys_statx
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment