Merge branch 'syscalls' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Wed, 14 Dec 2016 11:14:00 +0000 (11:14 +0000)
committerRussell King <rmk+kernel@armlinux.org.uk>
Wed, 14 Dec 2016 11:14:00 +0000 (11:14 +0000)
commited141f2890cdb738fc7131367f5fb15632bc3e60
treee6fd1b117b7d8968855e7f2d2f209ae102bf0be8
parent41884629fe579bde263dfc3d1284d0f5c7af7d1a
parent219622b7b3dc578799c067f316845ec18dee7d65
Merge branch 'syscalls' into for-linus

Conflicts:
arch/arm/include/asm/unistd.h
arch/arm/include/uapi/asm/unistd.h
arch/arm/kernel/calls.S
arch/arm/include/asm/Kbuild