From owner-svn-src-all@FreeBSD.ORG  Mon Mar 16 17:08:11 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 06DBA1065676;
	Mon, 16 Mar 2009 17:08:11 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E7B1A8FC25;
	Mon, 16 Mar 2009 17:08:10 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2GH8A5j066787;
	Mon, 16 Mar 2009 17:08:10 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2GH8AFo066786;
	Mon, 16 Mar 2009 17:08:10 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200903161708.n2GH8AFo066786@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 16 Mar 2009 17:08:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189888 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb security/audit
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, 16 Mar 2009 17:08:11 -0000

Author: rwatson
Date: Mon Mar 16 17:08:10 2009
New Revision: 189888
URL: http://svn.freebsd.org/changeset/base/189888

Log:
  Merge r186662 from head to stable/7:
  
    Fix white space botch: use carriage returns rather than tabs.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/security/audit/audit_pipe.c

Modified: stable/7/sys/security/audit/audit_pipe.c
==============================================================================
--- stable/7/sys/security/audit/audit_pipe.c	Mon Mar 16 17:03:33 2009	(r189887)
+++ stable/7/sys/security/audit/audit_pipe.c	Mon Mar 16 17:08:10 2009	(r189888)
@@ -169,7 +169,8 @@ struct audit_pipe {
 	/*
 	 * Current pending record list.  Protected by a combination of ap_mtx
 	 * and ap_sx.  Note particularly that *both* locks are required to
-	 * remove a record from the head of the queue, as an in-progress read		 * may sleep while copying and therefore cannot hold ap_mtx.
+	 * remove a record from the head of the queue, as an in-progress read
+	 * may sleep while copying and therefore cannot hold ap_mtx.
 	 */
 	TAILQ_HEAD(, audit_pipe_entry)	 ap_queue;