| commit | ed141f2890cdb738fc7131367f5fb15632bc3e60 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@armlinux.org.uk> | Wed Dec 14 11:14:00 2016 +0000 |
| committer | Russell King <rmk+kernel@armlinux.org.uk> | Wed Dec 14 11:14:00 2016 +0000 |
| tree | e6fd1b117b7d8968855e7f2d2f209ae102bf0be8 | |
| parent | 41884629fe579bde263dfc3d1284d0f5c7af7d1a [diff] | |
| parent | 219622b7b3dc578799c067f316845ec18dee7d65 [diff] |
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