From owner-cvs-src@FreeBSD.ORG  Wed Oct 22 22:33:54 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C5E3E16A4B3; Wed, 22 Oct 2003 22:33:54 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4ABF243F75; Wed, 22 Oct 2003 22:33:54 -0700 (PDT)
	(envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9N5XsXJ008507;
	Wed, 22 Oct 2003 22:33:54 -0700 (PDT)
	(envelope-from imp@repoman.freebsd.org)
Received: (from imp@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9N5XrwU008506;
	Wed, 22 Oct 2003 22:33:53 -0700 (PDT)
	(envelope-from imp)
Message-Id: <200310230533.h9N5XrwU008506@repoman.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 22 Oct 2003 22:33:53 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/dev/ep if_ep.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Oct 2003 05:33:54 -0000

imp         2003/10/22 22:33:53 PDT

  FreeBSD src repository

  Modified files:
    sys/dev/ep           if_ep.c 
  Log:
  Fix mismerge from one tree to another: add (
  
  Revision  Changes    Path
  1.124     +1 -1      src/sys/dev/ep/if_ep.c