Add missing copyright notices from Illumos

This resolves merge conflicts when merging Illumos #3588 and Illumos #4047.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1775

diff --git a/include/sys/dmu.h b/include/sys/dmu.h
index fd1460d5c47cd1b8db1912bad3a783755fe5b2c1..60d4aa58abc4d7ea63036986a78ec79365819a63 100644 (file)
--- a/include/sys/dmu.h
+++ b/include/sys/dmu.h
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
 

diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index 722995dc511bbf81ec3f97701dca880be17e8f83..7e3563285c70414f44dc6471077fc183bff414c2 100644 (file)
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */