From owner-p4-projects@FreeBSD.ORG  Wed Jul 16 13:00:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 606CE1065672; Wed, 16 Jul 2008 13:00:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2475A106566C
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 13:00:45 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 00F658FC15
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 13:00:45 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6GD0ijo054942
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 13:00:44 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6GD0iAn054940
	for perforce@freebsd.org; Wed, 16 Jul 2008 13:00:44 GMT
	(envelope-from ed@FreeBSD.org)
Date: Wed, 16 Jul 2008 13:00:44 GMT
Message-Id: <200807161300.m6GD0iAn054940@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145328 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jul 2008 13:00:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=145328

Change 145328 by ed@ed_dull on 2008/07/16 13:00:10

	IFC again, so I can generate working diffs again.

Affected files ...

.. //depot/projects/mpsafetty/sys/sys/termios.h#3 integrate

Differences ...

==== //depot/projects/mpsafetty/sys/sys/termios.h#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $FreeBSD: src/sys/sys/termios.h,v 1.21 2008/04/18 02:02:33 davidxu Exp $
+ * $FreeBSD: src/sys/sys/termios.h,v 1.22 2008/07/16 12:36:39 ed Exp $
  */
 
 #ifndef _SYS_TERMIOS_H_