Merge remote-tracking branch 'origin/master' into nuke_nca
commit4fae15b41d22a1e7bcab2bac249f1ccb7863cec1
authorLauri Tirkkonen <lotheac@iki.fi>
Mon, 31 Oct 2016 14:20:50 +0000 (31 16:20 +0200)
committerLauri Tirkkonen <lotheac@iki.fi>
Mon, 31 Oct 2016 14:20:50 +0000 (31 16:20 +0200)
tree7f8df2818b478a1515bc7ca25c1c75774dbed658
parent4de7b7d44ed5ed5e9b1cf1dc3ad5c0cd393660e3
parent83d8f24d33f9af96af96a7ecf0d1f6fee373148e
Merge remote-tracking branch 'origin/master' into nuke_nca
19 files changed:
Makefile
exception_lists/packaging
kernel/fs/sockfs/Makefile
kernel/fs/sockfs/sockcommon.c
kernel/fs/sockfs/sockcommon_sops.c
kernel/fs/sockfs/sockcommon_subr.c
kernel/fs/sockfs/socksubr.c
kernel/fs/sockfs/socksyscalls.c
kernel/fs/sockfs/socktpi.c
kernel/fs/sockfs/socktpi.h
usr/src/man/man1/Makefile
usr/src/man/man1m/Makefile
usr/src/uts/common/Makefile.files
usr/src/uts/common/Makefile.rules
usr/src/uts/common/io/ksocket/ksocket.c
usr/src/uts/common/sys/Makefile
usr/src/uts/common/syscall/sendfile.c
usr/src/uts/intel/Makefile.intel
usr/src/uts/sparc/Makefile.sparc