From owner-p4-projects@FreeBSD.ORG  Tue Apr 30 21:22:18 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 0F4CE42C; Tue, 30 Apr 2013 21:22:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C5DBA42A
 for <perforce@freebsd.org>; Tue, 30 Apr 2013 21:22:17 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B6B0B1926
 for <perforce@freebsd.org>; Tue, 30 Apr 2013 21:22:17 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3ULMHlL035210
 for <perforce@freebsd.org>; Tue, 30 Apr 2013 21:22:17 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3ULMHQG035207
 for perforce@freebsd.org; Tue, 30 Apr 2013 21:22:17 GMT
 (envelope-from brooks@freebsd.org)
Date: Tue, 30 Apr 2013 21:22:17 GMT
Message-Id: <201304302122.r3ULMHQG035207@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 228269 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Tue, 30 Apr 2013 21:22:18 -0000

http://p4web.freebsd.org/@@228269?ac=10

Change 228269 by brooks@brooks_zenith on 2013/04/30 21:21:40

	Correct a merge error in the $FreeBSD$ line.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_bus_nexus.c#3 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_bus_nexus.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cfi/cfi_bus_ixp4xx.c,v 1.3 2009/02/17 23:43:17 sam Exp $");
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_bus_nexus.c 249072 2013-04-03 22:37:40Z brooks $");
 
 #include <sys/param.h>
 #include <sys/systm.h>