projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4188462 219622b)
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 patch | diff1 | diff2 | blob | history

diff --cc arch/arm/include/asm/Kbuild
Simple merge
John Crispins staging tree