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

Commit c299eba3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (28 commits)
  ACPI:  delete stale reference in kernel-parameters.txt
  ACPI: add missing _OSI strings
  ACPI: remove NID_INVAL
  thermal: make THERMAL_HWMON implementation fully internal
  thermal: split hwmon lookup to a separate function
  thermal: hide CONFIG_THERMAL_HWMON
  ACPI print OSI(Linux) warning only once
  ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUX
  ACPI / Battery: propagate sysfs error in acpi_battery_add()
  ACPI / Battery: avoid acpi_battery_add() use-after-free
  ACPI: introduce "acpi_rsdp=" parameter for kdump
  ACPI: constify ops structs
  ACPI: fix CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
  ACPI: fix 80 char overflow
  ACPI / Battery: Resolve the race condition in the sysfs_remove_battery()
  ACPI / Battery: Add the check before refresh sysfs in the battery_notify()
  ACPI / Battery: Add the hibernation process in the battery_notify()
  ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirks
  ACPI / Battery: Change 16-bit signed negative battery current into correct value
  ACPI / Battery: Add the power unit macro
  ...
parents 1850536b 4a8f5058

Documentation/feature-removal-schedule.txt

+0 −9
Original line number Diff line number Diff line
@@ -296,15 +296,6 @@ Who: Ravikiran Thirumalai <kiran@scalex86.org> 


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



What:	CONFIG_THERMAL_HWMON

When:	January 2009

Why:	This option was introduced just to allow older lm-sensors userspace

	to keep working over the upgrade to 2.6.26. At the scheduled time of

	removal fixed lm-sensors (2.x or 3.x) should be readily available.

Who:	Rene Herman <rene.herman@gmail.com>



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



What:	Code that is now under CONFIG_WIRELESS_EXT_SYSFS

	(in net/core/net-sysfs.c)

When:	After the only user (hal) has seen a release with the patches

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


			See also Documentation/power/pm.txt, pci=noacpi



	acpi_rsdp=	[ACPI,EFI,KEXEC]

			Pass the RSDP address to the kernel, mostly used

			on machines running EFI runtime service to boot the

			second kernel for kdump.



	acpi_apic_instance=	[ACPI, IOAPIC]

			Format: <int>

			2: use 2nd APIC table, if available

drivers/acpi/acpica/acglobal.h

+6 −0
Original line number Diff line number Diff line
@@ -126,6 +126,12 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_copy_dsdt_locally, FALSE); 
 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_truncate_io_addresses, FALSE);



/*

 * Disable runtime checking and repair of values returned by control methods.

 * Use only if the repair is causing a problem on a particular machine.

 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_auto_repair, FALSE);



/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */



struct acpi_table_fadt acpi_gbl_FADT;

drivers/acpi/acpica/aclocal.h

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ struct acpi_predefined_data { 
	char *pathname;

	const union acpi_predefined_info *predefined;

	union acpi_operand_object *parent_package;

	struct acpi_namespace_node *node;

	u32 flags;

	u8 node_flags;

};

drivers/acpi/acpica/acpredef.h

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ static const union acpi_predefined_info predefined_names[] = 
	{{"_SWS", 0, ACPI_RTYPE_INTEGER}},

	{{"_TC1", 0, ACPI_RTYPE_INTEGER}},

	{{"_TC2", 0, ACPI_RTYPE_INTEGER}},

	{{"_TDL", 0, ACPI_RTYPE_INTEGER}},

	{{"_TIP", 1, ACPI_RTYPE_INTEGER}},

	{{"_TIV", 1, ACPI_RTYPE_INTEGER}},

	{{"_TMP", 0, ACPI_RTYPE_INTEGER}},