]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'work.sys_wait' into misc.alpha
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 27 May 2017 20:22:20 +0000 (16:22 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 27 May 2017 20:22:20 +0000 (16:22 -0400)
1  2 
arch/alpha/kernel/osf_sys.c

Simple merge