From owner-svn-src-stable@FreeBSD.ORG  Sat Sep 11 14:46:20 2010
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 BDEAC1065670;
	Sat, 11 Sep 2010 14:46:20 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACBF58FC1A;
	Sat, 11 Sep 2010 14:46: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 o8BEkJEQ006555;
	Sat, 11 Sep 2010 14:46:19 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8BEkJUR006553;
	Sat, 11 Sep 2010 14:46:19 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201009111446.o8BEkJUR006553@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sat, 11 Sep 2010 14:46:19 +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: r212474 - stable/7/sys/boot/forth
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: Sat, 11 Sep 2010 14:46:20 -0000

Author: brucec
Date: Sat Sep 11 14:46:19 2010
New Revision: 212474
URL: http://svn.freebsd.org/changeset/base/212474

Log:
  MFC r182194:
  
  Add geom_journal
  
  PR:		conf/126829
  Approved by:	rrs (mentor)

Modified:
  stable/7/sys/boot/forth/loader.conf
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/boot/forth/loader.conf
==============================================================================
--- stable/7/sys/boot/forth/loader.conf	Sat Sep 11 14:39:53 2010	(r212473)
+++ stable/7/sys/boot/forth/loader.conf	Sat Sep 11 14:46:19 2010	(r212474)
@@ -149,6 +149,7 @@ geom_concat_load="NO"		# Concatenated di
 geom_eli_load="NO"		# Disk encryption driver (see geli(8))
 geom_gate_load="NO"		# Userland disk driver (see geom_gate(4),
 				# ggatec(8), ggated(8), ggatel(8))
+geom_journal_load="NO"		# Journaled filesystem driver (see gjournal(8))
 geom_label_load="NO"		# File system labels (see glabel(8))
 geom_md_load="NO"		# Memory disk driver (vnode/swap/malloc) (see
 				# md(4), mdconfig(8))