From owner-p4-projects@FreeBSD.ORG  Tue May 18 02:27:38 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B9E531065674; Tue, 18 May 2010 02:27:38 +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 7E4E41065677
	for <perforce@freebsd.org>; Tue, 18 May 2010 02:27:38 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B43E8FC08
	for <perforce@freebsd.org>; Tue, 18 May 2010 02:27:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4I2Rces040097
	for <perforce@freebsd.org>; Tue, 18 May 2010 02:27:38 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4I2Rc3L040095
	for perforce@freebsd.org; Tue, 18 May 2010 02:27:38 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 18 May 2010 02:27:38 GMT
Message-Id: <201005180227.o4I2Rc3L040095@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178418 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 18 May 2010 02:27:39 -0000

http://p4web.freebsd.org/@@178418?ac=10

Change 178418 by thompsa@thompsa_pea on 2010/05/18 02:27:25

	Force integration origin to //depot/vendor/freebsd/... since these
	files originated in this branch.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#7 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#11 (text+ko) ====

@@ -1,5 +1,3 @@
-/*	$FreeBSD$	*/
-
 /*-
  * Copyright (c) 2008,2010 Damien Bergamini <damien.bergamini@free.fr>
  * ported to FreeBSD by Akinori Furukoshi <moonlightakkiy@yahoo.ca>
@@ -19,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.9 2010/05/13 00:19:03 thompsa Exp $");
 
 /*-
  * Ralink Technology RT2700U/RT2800U/RT3000U chipset driver.

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#5 (text+ko) ====

@@ -15,6 +15,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $FreeBSD: src/sys/dev/usb/wlan/if_runreg.h,v 1.3 2010/05/13 00:19:03 thompsa Exp $
  */
 
 #ifndef _IF_RUNREG_H_

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#7 (text+ko) ====

@@ -16,6 +16,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $FreeBSD: src/sys/dev/usb/wlan/if_runvar.h,v 1.5 2010/05/13 00:19:03 thompsa Exp $
  */
 
 #ifndef _IF_RUNVAR_H_