From owner-svn-src-all@FreeBSD.ORG  Fri Jan 20 22:55:17 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5BAC6106566B;
	Fri, 20 Jan 2012 22:55:17 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 49DEA8FC15;
	Fri, 20 Jan 2012 22:55:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0KMtHcE062578;
	Fri, 20 Jan 2012 22:55:17 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0KMtH7q062575;
	Fri, 20 Jan 2012 22:55:17 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201201202255.q0KMtH7q062575@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Fri, 20 Jan 2012 22:55:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230402 - in head/cddl/contrib/opensolaris: cmd/zfs
	lib/libzfs/common
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Jan 2012 22:55:17 -0000

Author: mm
Date: Fri Jan 20 22:55:16 2012
New Revision: 230402
URL: http://svn.freebsd.org/changeset/base/230402

Log:
  Add accidentially removed copyright lines in r228103
  
  Reported by:	pjd
  MFC after:	3 days

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Fri Jan 20 22:37:10 2012	(r230401)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Fri Jan 20 22:55:16 2012	(r230402)
@@ -24,6 +24,7 @@
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
  * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>.
+ * All rights reserved.
  * Copyright (c) 2011 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  */
 

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Fri Jan 20 22:37:10 2012	(r230401)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Fri Jan 20 22:55:16 2012	(r230402)
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>.
  * Copyright (c) 2011 by Delphix. All rights reserved.
  * All rights reserved.
  */