From owner-cvs-src-old@FreeBSD.ORG  Sun Mar 13 13:37:39 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE9F3106574A
	for <cvs-src-old@freebsd.org>; Sun, 13 Mar 2011 13:37:39 +0000 (UTC)
	(envelope-from kib@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 832E28FC0A
	for <cvs-src-old@freebsd.org>; Sun, 13 Mar 2011 13:37:39 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p2DDbdRY024616
	for <cvs-src-old@freebsd.org>; Sun, 13 Mar 2011 13:37:39 GMT
	(envelope-from kib@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p2DDbdWA024615
	for cvs-src-old@freebsd.org; Sun, 13 Mar 2011 13:37:39 GMT
	(envelope-from kib@repoman.freebsd.org)
Message-Id: <201103131337.p2DDbdWA024615@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	kib@repoman.freebsd.org using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 13 Mar 2011 13:37:23 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/sys/kern imgact_shell.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2011 13:37:39 -0000

kib         2011-03-13 13:37:23 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/kern             imgact_shell.c 
  Log:
  SVN rev 219607 on 2011-03-13 13:37:23Z by kib
  
  Fix mismerge.
  
  Pointy hat to:  kib
  
  Revision   Changes    Path
  1.35.10.2  +1 -1      src/sys/kern/imgact_shell.c