From owner-p4-projects@FreeBSD.ORG  Mon Sep  1 19:37:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A85A1065673; Mon,  1 Sep 2008 19:37:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C235F1065687
	for <perforce@freebsd.org>; Mon,  1 Sep 2008 19:37:29 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9268D8FC30
	for <perforce@freebsd.org>; Mon,  1 Sep 2008 19:37:29 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81JbTvt000378
	for <perforce@freebsd.org>; Mon, 1 Sep 2008 19:37:29 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81JbTac000376
	for perforce@freebsd.org; Mon, 1 Sep 2008 19:37:29 GMT
	(envelope-from brooks@freebsd.org)
Date: Mon, 1 Sep 2008 19:37:29 GMT
Message-Id: <200809011937.m81JbTac000376@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 149008 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Sep 2008 19:37:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=149008

Change 149008 by brooks@brooks_coredump on 2008/09/01 19:37:23

	Fix mis-merge.  Don't include socket.h twice.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#7 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#7 (text+ko) ====

@@ -45,7 +45,6 @@
 #include <sys/socket.h>
 #include <sys/vimage.h>
 
-#include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>