summaryrefslogtreecommitdiff
path: root/usr/src/Makefile
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2017-01-03 12:33:48 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2017-01-03 12:33:48 +0000
commitc009bfad466702b7c3f2f59cb69eb07291895b75 (patch)
tree2b089a9543e3de8fdcb542119661af4f161b3d98 /usr/src/Makefile
parent5799bf1e75edab0945b880f7e6c9542bd5e243f3 (diff)
parent957f6e722ed34de1328d9a8ce2c1932fd21f8c85 (diff)
downloadillumos-joyent-c009bfad466702b7c3f2f59cb69eb07291895b75.tar.gz
[illumos-gate merge]
commit 957f6e722ed34de1328d9a8ce2c1932fd21f8c85 7689 Comment typos and formatting fixes in NFSv4 client sources commit e2fb2b65b4c67a1ead9ea88052bb3fdb5ee65d59 7714 Extracted libc licenses should be sorted commit 2dc323c78a19e11644ede0abb76adb8c2b8c7c5c 7664 devfsadm.h not updating by incremental build commit ff5177ee8bf9a355131ce2cc61ae2da6a5a6fdd6 6569 large file delete can starve out write ops
Diffstat (limited to 'usr/src/Makefile')
-rw-r--r--usr/src/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index 5fe34ddd48..0320a35159 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -25,6 +25,7 @@
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2016 Joyent, Inc.
#
#