From owner-cvs-all  Sat Feb  1 17:57:33 2003
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1760F37B401; Sat,  1 Feb 2003 17:57:33 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 503C643F43; Sat,  1 Feb 2003 17:57:32 -0800 (PST)
	(envelope-from marcel@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h121vWbv026271;
	Sat, 1 Feb 2003 17:57:32 -0800 (PST)
	(envelope-from marcel@repoman.freebsd.org)
Received: (from marcel@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h121vWKl026270;
	Sat, 1 Feb 2003 17:57:32 -0800 (PST)
Message-Id: <200302020157.h121vWKl026270@repoman.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 1 Feb 2003 17:57:32 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/dev/usb usbdevs
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

marcel      2003/02/01 17:57:32 PST

  Modified files:
    sys/dev/usb          usbdevs 
  Log:
  Unbreak kernel builds caused by what appears to be a merge conflict.
  This change has been tested.
  
  Revision  Changes    Path
  1.110     +1 -2      src/sys/dev/usb/usbdevs

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message