From owner-svn-src-stable@FreeBSD.ORG  Fri Sep 23 05:35:24 2011
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 9CACE1065670;
	Fri, 23 Sep 2011 05:35:24 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BF028FC08;
	Fri, 23 Sep 2011 05:35:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8N5ZOt4056583;
	Fri, 23 Sep 2011 05:35:24 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8N5ZOuc056581;
	Fri, 23 Sep 2011 05:35:24 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <201109230535.p8N5ZOuc056581@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Fri, 23 Sep 2011 05:35:24 +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: r225739 - stable/8/share/man/man4
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: Fri, 23 Sep 2011 05:35:24 -0000

Author: lstewart
Date: Fri Sep 23 05:35:24 2011
New Revision: 225739
URL: http://svn.freebsd.org/changeset/base/225739

Log:
  Follow up to r225738 to fix the mismerge of share/man/man4/Makefile.
  
  This is an intentional direct commit to the 8-STABLE branch.

Modified:
  stable/8/share/man/man4/Makefile

Modified: stable/8/share/man/man4/Makefile
==============================================================================
--- stable/8/share/man/man4/Makefile	Fri Sep 23 05:28:09 2011	(r225738)
+++ stable/8/share/man/man4/Makefile	Fri Sep 23 05:35:24 2011	(r225739)
@@ -225,7 +225,6 @@ MAN=	aac.4 \
 	mmcsd.4 \
 	mn.4 \
 	mod_cc.4 \
-	mos.4 \
 	mouse.4 \
 	mps.4 \
 	mpt.4 \