Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38ebb1e0 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents 236a686b 9f737633

Documentation/cpu-freq/user-guide.txt

+4 −1
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ scaling_min_freq and 
scaling_max_freq		show the current "policy limits" (in

				kHz). By echoing new values into these

				files, you can change these limits.

				NOTE: when setting a policy you need to

				first set scaling_max_freq, then

				scaling_min_freq.





If you have selected the "userspace" governor which allows you to

Documentation/sysctl/kernel.txt

+2 −3
Original line number Diff line number Diff line
@@ -211,9 +211,8 @@ Controls the kernel's behaviour when an oops or BUG is encountered. 


0: try to continue operation



1: delay a few seconds (to give klogd time to record the oops output) and

   then panic.  If the `panic' sysctl is also non-zero then the machine will

   be rebooted.

1: panic immediatly.  If the `panic' sysctl is also non-zero then the

   machine will be rebooted.



==============================================================

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -298,6 +298,13 @@ L: info-linux@geode.amd.com 
W:	http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html

S:	Supported



AOA (Apple Onboard Audio) ALSA DRIVER

P:	Johannes Berg

M:	johannes@sipsolutions.net

L:	linuxppc-dev@ozlabs.org

L:	alsa-devel@alsa-project.org

S:	Maintained



APM DRIVER

P:	Stephen Rothwell

M:	sfr@canb.auug.org.au
@@ -2641,6 +2648,14 @@ M: dbrownell@users.sourceforge.net 
L:	spi-devel-general@lists.sourceforge.net

S:	Maintained



STABLE BRANCH:

P:	Greg Kroah-Hartman

M:	greg@kroah.com

P:	Chris Wright

M:	chrisw@sous-sol.org

L:	stable@kernel.org

S:	Maintained



TPM DEVICE DRIVER

P:	Kylene Hall

M:	kjhall@us.ibm.com

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 18

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME=Crazed Snow-Weasel



# *DOCUMENTATION*

arch/i386/kernel/cpu/cpufreq/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ config X86_POWERNOW_K8_ACPI 


config X86_GX_SUSPMOD

	tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation"

	depends on PCI

	help

	 This add the CPUFreq driver for NatSemi Geode processors which

	 support suspend modulation.
@@ -202,7 +203,7 @@ config X86_LONGRUN 
config X86_LONGHAUL

	tristate "VIA Cyrix III Longhaul"

	select CPU_FREQ_TABLE

	depends on BROKEN

	depends on ACPI_PROCESSOR

	help

	  This adds the CPUFreq driver for VIA Samuel/CyrixIII,

	  VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T