From owner-svn-src-stable@FreeBSD.ORG  Sat May 23 17:17:55 2009
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 4011F1065673;
	Sat, 23 May 2009 17:17:55 +0000 (UTC)
	(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C31F8FC19;
	Sat, 23 May 2009 17:17:55 +0000 (UTC)
	(envelope-from antoine@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 n4NHHt59061905;
	Sat, 23 May 2009 17:17:55 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4NHHtpd061903;
	Sat, 23 May 2009 17:17:55 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <200905231717.n4NHHtpd061903@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 23 May 2009 17:17:55 +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: r192654 - in stable/7/sys: . amd64/conf boot/forth
	contrib/pf dev/ath/ath_hal dev/cxgb
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, 23 May 2009 17:17:56 -0000

Author: antoine
Date: Sat May 23 17:17:54 2009
New Revision: 192654
URL: http://svn.freebsd.org/changeset/base/192654

Log:
  MFC r189872 to stable/7:
    Chase the k8temp->amdtemp rename in NOTES and loader.conf.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/conf/NOTES
  stable/7/sys/boot/forth/loader.conf
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/amd64/conf/NOTES
==============================================================================
--- stable/7/sys/amd64/conf/NOTES	Sat May 23 17:13:35 2009	(r192653)
+++ stable/7/sys/amd64/conf/NOTES	Sat May 23 17:17:54 2009	(r192654)
@@ -456,10 +456,10 @@ device		ichwd
 # Temperature sensors:
 #
 # coretemp: on-die sensor on Intel Core and newer CPUs
-# k8temp: on-die sensor on AMD K8 CPUs
+# amdtemp: on-die sensor on AMD K8/K10/K11 CPUs
 #
 device		coretemp
-device		k8temp
+device		amdtemp
 
 #---------------------------------------------------------------------------
 # ISDN4BSD

Modified: stable/7/sys/boot/forth/loader.conf
==============================================================================
--- stable/7/sys/boot/forth/loader.conf	Sat May 23 17:13:35 2009	(r192653)
+++ stable/7/sys/boot/forth/loader.conf	Sat May 23 17:17:54 2009	(r192654)
@@ -388,7 +388,7 @@ accf_http_load="NO"		# Wait for full HTT
 random_load="NO"		# Random device
 speaker_load="NO"		# AT speaker module
 coretemp_load="NO"		# Intel Core CPU temperature monitor
-k8temp_load="NO"		# AMD K8 temperature monitor
+amdtemp_load="NO"		# AMD K8/K10/K11 temperature monitor
 
 ##############################################################
 ###  ACPI settings  ##########################################