diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-29 18:21:30 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-29 18:21:30 +0300 |
commit | 116ef0fcc9268a876c8d1bbf77d8fa80111fa526 (patch) | |
tree | 95d1386dd5c7da2f1ef27e2aa4173824e6d93dc5 /arch/arm/include/asm/unistd.h | |
parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
parent | 38850d786a799c3ff2de0dc1980902c3263698dc (diff) | |
parent | a4283e41bbd80c629770f954cc5d013eb8851229 (diff) | |
download | linux-116ef0fcc9268a876c8d1bbf77d8fa80111fa526.tar.xz |
Merge branches 'fixes' and 'misc' into for-next