Date: Tue, 2 Feb 2010 11:21:06 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 174141 for review Message-ID: <201002021121.o12BL6hJ038980@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=174141 Change 174141 by mav@mav_mavbook on 2010/02/02 11:20:13 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#77 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#40 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#102 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#36 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#51 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-usb.c#11 delete .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#40 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#16 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#77 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.20 2010/01/28 08:41:30 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.21 2010/02/02 11:09:28 mav Exp $"); #include <sys/param.h> #include <sys/bus.h> ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#40 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.43 2010/01/28 08:41:30 mav Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.44 2010/02/02 11:09:28 mav Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#102 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.26 2010/01/29 12:47:04 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.27 2010/02/02 11:09:28 mav Exp $"); #include <sys/param.h> #include <sys/module.h> ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#36 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.9 2010/01/28 17:54:47 mav Exp $ + * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.10 2010/02/02 11:09:28 mav Exp $ */ /* ATA register defines */ ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#51 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.316 2010/01/28 08:41:30 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.317 2010/02/02 11:09:28 mav Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#30 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.151 2009/12/13 00:13:21 marius Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.152 2010/02/02 11:09:28 mav Exp $ */ #if 0 ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#40 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.19 2010/01/29 12:47:04 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.20 2010/02/02 11:09:28 mav Exp $"); #include <sys/param.h> #include <sys/module.h> ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#16 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/siis/siis.h,v 1.8 2009/12/29 21:49:11 mav Exp $ + * $FreeBSD: src/sys/dev/siis/siis.h,v 1.9 2010/02/02 11:09:28 mav Exp $ */ /* ATA register defines */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002021121.o12BL6hJ038980>