summaryrefslogtreecommitdiff
path: root/CodingStyle
diff options
context:
space:
mode:
Diffstat (limited to 'CodingStyle')
0 files changed, 0 insertions, 0 deletions
be8 /arch parent41884629fe579bde263dfc3d1284d0f5c7af7d1a (diff)parent219622b7b3dc578799c067f316845ec18dee7d65 (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
Diffstat (limited to 'arch')