linux/include/acpi
Rafael J. Wysocki d4c091f13d Merge branch 'acpi-general'
* acpi-general: (38 commits)
  ACPI / thermal: _TMP and _CRT/_HOT/_PSV/_ACx dependency fix
  ACPI: drop unnecessary local variable from acpi_system_write_wakeup_device()
  ACPI: Fix logging when no pci_irq is allocated
  ACPI: Update Dock hotplug error messages
  ACPI: Update Container hotplug error messages
  ACPI: Update Memory hotplug error messages
  ACPI: Update CPU hotplug error messages
  ACPI: Add acpi_handle_<level>() interfaces
  ACPI: remove use of __devexit
  ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist.
  ACPI / battery: Correct battery capacity values on Thinkpads
  Revert "ACPI / x86: Add quirk for "CheckPoint P-20-00" to not use bridge _CRS_ info"
  ACPI: create _SUN sysfs file
  ACPI / memhotplug: bind the memory device when the driver is being loaded
  ACPI / memhotplug: don't allow to eject the memory device if it is being used
  ACPI / memhotplug: free memory device if acpi_memory_enable_device() failed
  ACPI / memhotplug: fix memory leak when memory device is unbound from acpi_memhotplug
  ACPI / memhotplug: deal with eject request in hotplug queue
  ACPI / memory-hotplug: add memory offline code to acpi_memory_device_remove()
  ACPI / memory-hotplug: call acpi_bus_trim() to remove memory device
  ...

Conflicts:
	include/linux/acpi.h (two additions at the end of the same file)
2012-11-29 21:43:06 +01:00
..
platform UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
acbuffer.h ACPICA: Add struct header support for _FDE, _GRT, _GTM, and _SRT names. 2012-09-21 00:26:17 -04:00
acconfig.h ACPICA: Fix unmerged debugger divergences. 2012-11-15 00:31:22 +01:00
acexcep.h ACPICA: Remove extra spaces after periods within comments 2012-11-15 00:31:26 +01:00
acnames.h ACPICA: AcpiGetObjectInfo: Add support for ACPI 5 _SUB method 2012-11-15 00:31:30 +01:00
acoutput.h ACPICA: Update header files copyrights to 2012 2012-07-17 00:05:50 -04:00
acpi_bus.h Merge branch 'acpi-general' 2012-11-29 21:43:06 +01:00
acpi_drivers.h ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning 2011-11-06 20:58:17 -05:00
acpi_numa.h ACPI: Store SRAT table revision 2012-01-17 04:19:04 -05:00
acpi.h UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
acpiosxf.h ACPICA: Remove extra spaces after periods in the Intel license 2012-11-15 00:31:26 +01:00
acpixf.h ACPICA: Update version to 20121018 2012-11-15 00:31:30 +01:00
acrestyp.h ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
actbl1.h ACPICA: Headers: Add new ACPI 5 HEST notify type values. 2012-09-21 00:34:57 -04:00
actbl2.h ACPICA: Add support for complex _PLD buffers. 2012-09-21 00:26:17 -04:00
actbl3.h ACPICA: Update support for ACPI 5 MPST table 2012-11-15 00:31:28 +01:00
actbl.h ACPICA: Add support for complex _PLD buffers. 2012-09-21 00:26:17 -04:00
actypes.h ACPICA: AcpiGetObjectInfo: Add support for ACPI 5 _SUB method 2012-11-15 00:31:30 +01:00
apei.h module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
button.h ACPI: make ACPI button funcs no-ops if not built in 2009-09-17 14:48:23 -07:00
container.h
hed.h ACPI Hardware Error Device (PNP0C33) support 2010-05-19 22:40:24 -04:00
pdc_intel.h ACPI: Enable bit 11 in _PDC to advertise hw coord 2009-02-07 00:41:14 -05:00
processor.h cpuidle / ACPI : move cpuidle_device field out of the acpi_processor_power structure 2012-09-17 23:01:56 +02:00
reboot.h Add the ability to reset the machine using the RESET_REG in ACPI's FADT table. 2008-07-16 23:27:08 +02:00
video.h i915: Fix opregion notifications 2011-07-13 11:19:47 -07:00