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

Commit d3608b56 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote branch 'origin/x86/urgent' into x86/asm

parents 650fb439 113fc5a6

Documentation/feature-removal-schedule.txt

+7 −0
Original line number 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 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

			low power states, to be enforced (the ACPI 2.0 ordering

			of _PTS is used by default).

			s4_nonvs prevents the kernel from saving/restoring the

			ACPI NVS memory during hibernation.

			nonvs prevents the kernel from saving/restoring the

			ACPI NVS memory during suspend/hibernation and resume.

			sci_force_enable causes the kernel to set SCI_EN directly

			on resume from S1/S3 (which is against the ACPI spec,

			but some broken systems don't work without it).

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 35

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Sheep on Meth



# *DOCUMENTATION*

arch/arm/mach-clps711x/include/mach/debug-macro.S

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 *

*/



#include <mach/hardware.h>

#include <asm/hardware/clps7111.h>



		.macro	addruart, rx, tmp

arch/arm/mach-footbridge/common.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ EXPORT_SYMBOL(__bus_to_virt); 


unsigned long __pfn_to_bus(unsigned long pfn)

{

	return __pfn_to_phys(pfn) + (fb_bus_sdram_offset() - PHYS_OFFSET));

	return __pfn_to_phys(pfn) + (fb_bus_sdram_offset() - PHYS_OFFSET);

}

EXPORT_SYMBOL(__pfn_to_bus);