From owner-svn-src-user@FreeBSD.ORG  Sun Aug 22 21:53:55 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5F7151065698;
	Sun, 22 Aug 2010 21:53:55 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 358768FC13;
	Sun, 22 Aug 2010 21:53:55 +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 o7MLrtxl017754;
	Sun, 22 Aug 2010 21:53:55 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7MLrtQF017753;
	Sun, 22 Aug 2010 21:53:55 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201008222153.o7MLrtQF017753@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 22 Aug 2010 21:53:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211658 - user/imp/tbemd/sys/contrib/octeon-sdk
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Aug 2010 21:53:55 -0000

Author: imp
Date: Sun Aug 22 21:53:54 2010
New Revision: 211658
URL: http://svn.freebsd.org/changeset/base/211658

Log:
  Merge to head @211636 -- with hand tweaks [given up] hoping for the best

Added:
  user/imp/tbemd/sys/contrib/octeon-sdk/
     - copied from r211636, head/sys/contrib/octeon-sdk/
Modified:
Directory Properties:
  user/imp/tbemd/sys/contrib/pf/   (props changed)
  user/imp/tbemd/sys/contrib/x86emu/   (props changed)