Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 May 2010 02:27:38 GMT
From:      Andrew Thompson <thompsa@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 178418 for review
Message-ID:  <201005180227.o4I2Rc3L040095@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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_



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005180227.o4I2Rc3L040095>