From owner-p4-projects@FreeBSD.ORG  Tue Feb 17 21:44:41 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 902E41065692; Tue, 17 Feb 2009 21:44:41 +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 485C2106567B
	for <perforce@freebsd.org>; Tue, 17 Feb 2009 21:44:41 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 36E188FC18
	for <perforce@freebsd.org>; Tue, 17 Feb 2009 21:44:41 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1HLif6Q019885
	for <perforce@freebsd.org>; Tue, 17 Feb 2009 21:44:41 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1HLifsY019883
	for perforce@freebsd.org; Tue, 17 Feb 2009 21:44:41 GMT
	(envelope-from julian@freebsd.org)
Date: Tue, 17 Feb 2009 21:44:41 GMT
Message-Id: <200902172144.n1HLifsY019883@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 157871 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: Tue, 17 Feb 2009 21:44:43 -0000

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

Change 157871 by julian@julian_trafmon1 on 2009/02/17 21:44:30

	chase -current.. IFC@157869

Affected files ...

.. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#11 integrate
.. //depot/projects/vimage/src/sys/netinet/ipprotosw.h#3 delete

Differences ...

==== //depot/projects/vimage/src/sys/dev/ata/ata-all.c#11 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.292 2009/02/17 21:17:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.293 2009/02/17 21:35:17 mav Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -358,7 +358,6 @@
 	}
     } while (0);
     mtx_unlock(&ch->state_mtx);
-    return;
 }
 
 /*