]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
Conflicts:
arch/arm/include/asm/unistd.h
arch/arm/include/uapi/asm/unistd.h
arch/arm/kernel/calls.S

1  2 
arch/arm/include/asm/Kbuild

Simple merge