From owner-svn-src-stable@FreeBSD.ORG  Sat Dec 19 11:11:57 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A876106568B;
	Sat, 19 Dec 2009 11:11:57 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 593008FC19;
	Sat, 19 Dec 2009 11:11:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBJBBvUF031284;
	Sat, 19 Dec 2009 11:11:57 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJBBvAn031282;
	Sat, 19 Dec 2009 11:11:57 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200912191111.nBJBBvAn031282@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 19 Dec 2009 11:11:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200720 - stable/8
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Dec 2009 11:11:57 -0000

Author: delphij
Date: Sat Dec 19 11:11:57 2009
New Revision: 200720
URL: http://svn.freebsd.org/changeset/base/200720

Log:
  Fix inappropriate merge.
  
  Pointed out by:	kib
  Pointy hat to:	delphij

Modified:
  stable/8/ObsoleteFiles.inc

Modified: stable/8/ObsoleteFiles.inc
==============================================================================
--- stable/8/ObsoleteFiles.inc	Sat Dec 19 11:10:33 2009	(r200719)
+++ stable/8/ObsoleteFiles.inc	Sat Dec 19 11:11:57 2009	(r200720)
@@ -16,14 +16,6 @@
 
 # 20091218: removal of rc.early(8) link
 OLD_FILES+=usr/share/man/man8/rc.early.8.gz
-# 20091027: pselect.3 implemented as syscall
-OLD_FILES+=usr/share/man/man3/pselect.3.gz
-# 20091005: fusword.9 and susword.9 removed
-OLD_FILES+=usr/share/man/man9/fusword.9.gz
-OLD_FILES+=usr/share/man/man9/susword.9.gz
-# 20090909: vesa and dpms promoted to be i386/amd64 common
-OLD_FILES+=usr/include/machine/pc/vesa.h
-OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
 # 20090904: remove lukemftpd
 OLD_FILES+=usr/libexec/lukemftpd
 OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz