From owner-svn-src-all@FreeBSD.ORG  Mon Aug 17 14:53:21 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D8AD1065690;
	Mon, 17 Aug 2009 14:53:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E8C598FC79;
	Mon, 17 Aug 2009 14:53:20 +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 n7HErKP4081048;
	Mon, 17 Aug 2009 14:53:20 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HErK7V081047;
	Mon, 17 Aug 2009 14:53:20 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200908171453.n7HErK7V081047@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 17 Aug 2009 14:53:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196324 - head/sys/dev/ata
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2009 14:53:21 -0000

Author: jhb
Date: Mon Aug 17 14:53:20 2009
New Revision: 196324
URL: http://svn.freebsd.org/changeset/base/196324

Log:
  Remove bogus mergeinfo claiming that change 185357 from head/sys was merged
  into head/sys/dev/ata.  The mergeinfo was added as a side effect of another
  change and not as part of a merge.  The rest of the mergeinfo on dev/ata
  was a valid subset of the parent mergeinfo on sys/.
  
  Approved by:	re (mergeinfo blanket)

Modified:
  head/sys/dev/ata/   (props changed)