git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92a1840 417b4a7)
Merge branch 'acpi-headers'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:52:05 +0000 (23:52 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:52:05 +0000 (23:52 +0200)
* acpi-headers:
  ACPI: Add support to force header inclusion rules for <acpi/acpi.h>.
  ACPI / SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - table definitions.
  ACPICA: Linux: Allow ACPICA inclusion for CONFIG_ACPI=n builds.
  ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion.
  ACPICA: Linux: Add stub implementation of ACPICA 64-bit mathematics.
  ACPICA: Linux: Add stub support for Linux specific variables and functions.

1  2 
drivers/acpi/acpica/Makefile patch | diff1 | diff2 | blob | history
include/acpi/acpixf.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/acpica/Makefile
Simple merge
diff --cc include/acpi/acpixf.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.