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

Commit 3772b734 authored Aug 02, 2010 by Ingo Molnar

Merge commit 'v2.6.35' into perf/core



Conflicts:
	tools/perf/Makefile
	tools/perf/util/hist.c

Merge reason: Resolve the conflicts and update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

parents 9fc3af46 9fe6206f

Documentation/credentials.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -417,6 +417,9 @@ reference on them using:
	This does all the RCU magic inside of it. The caller must call put_cred() on		This does all the RCU magic inside of it. The caller must call put_cred() on
	the credentials so obtained when they're finished with.		the credentials so obtained when they're finished with.

			[*] Note: The result of __task_cred() should not be passed directly to
			get_cred() as this may race with commit_cred().

	There are a couple of convenience functions to access bits of another task's		There are a couple of convenience functions to access bits of another task's
	credentials, hiding the RCU magic from the caller:		credentials, hiding the RCU magic from the caller:

Documentation/feature-removal-schedule.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -647,3 +647,10 @@ Who: Stefan Richter <stefanr@s5r6.in-berlin.de>

	----------------------------		----------------------------

			What: The acpi_sleep=s4_nonvs command line option
			When: 2.6.37
			Files: arch/x86/kernel/acpi/sleep.c
			Why: superseded by acpi_sleep=nonvs
			Who: Rafael J. Wysocki <rjw@sisk.pl>

			----------------------------

Documentation/kernel-parameters.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -254,8 +254,8 @@ and is between 256 and 4096 characters. It is defined in the file
	control method, with respect to putting devices into		control method, with respect to putting devices into
	low power states, to be enforced (the ACPI 2.0 ordering		low power states, to be enforced (the ACPI 2.0 ordering
	of _PTS is used by default).		of _PTS is used by default).
	s4_nonvs prevents the kernel from saving/restoring the		nonvs prevents the kernel from saving/restoring the
	ACPI NVS memory during hibernation.		ACPI NVS memory during suspend/hibernation and resume.
	sci_force_enable causes the kernel to set SCI_EN directly		sci_force_enable causes the kernel to set SCI_EN directly
	on resume from S1/S3 (which is against the ACPI spec,		on resume from S1/S3 (which is against the ACPI spec,
	but some broken systems don't work without it).		but some broken systems don't work without it).

MAINTAINERS

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6236,6 +6236,8 @@ F: drivers/mmc/host/wbsd.*

	WATCHDOG DEVICE DRIVERS		WATCHDOG DEVICE DRIVERS
	M: Wim Van Sebroeck <wim@iguana.be>		M: Wim Van Sebroeck <wim@iguana.be>
			L: linux-watchdog@vger.kernel.org
			W: http://www.linux-watchdog.org/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
	S: Maintained		S: Maintained
	F: Documentation/watchdog/		F: Documentation/watchdog/

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 35		SUBLEVEL = 35
	EXTRAVERSION = -rc5		EXTRAVERSION =
	NAME = Sheep on Meth		NAME = Sheep on Meth

	# DOCUMENTATION		# DOCUMENTATION