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
This commit is contained in:
Linus Torvalds 2017-03-17 12:14:49 -07:00
commit c79d5ff0e2

View file

@ -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