From owner-cvs-src-old@FreeBSD.ORG  Sun Jan 10 20:22:18 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87B6E1065796
	for <cvs-src-old@freebsd.org>; Sun, 10 Jan 2010 20:22:18 +0000 (UTC)
	(envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5EDF88FC13
	for <cvs-src-old@freebsd.org>; Sun, 10 Jan 2010 20:22:18 +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 o0AKMIeW013338
	for <cvs-src-old@freebsd.org>; Sun, 10 Jan 2010 20:22:18 GMT
	(envelope-from imp@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0AKMIn5013337
	for cvs-src-old@freebsd.org; Sun, 10 Jan 2010 20:22:18 GMT
	(envelope-from imp@repoman.freebsd.org)
Message-Id: <201001102022.o0AKMIn5013337@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	imp@repoman.freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 10 Jan 2010 20:22:05 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/mips/include bus.h
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jan 2010 20:22:18 -0000

imp         2010-01-10 20:22:05 UTC

  FreeBSD src repository

  Modified files:
    sys/mips/include     bus.h 
  Log:
  SVN rev 202044 on 2010-01-10 20:22:05Z by imp
  
  Fix mis-merge from projects/mips...  the diff didn't apply correctly
  and I didn't notice until after the commit.
  
  Revision  Changes    Path
  1.4       +623 -804  src/sys/mips/include/bus.h