Rafael J. Wysocki 98feb7cc61 Merge branch 'acpi-cleanup' ... * acpi-cleanup: (22 commits) ACPI / tables: Return proper error codes from acpi_table_parse() and fix comment. ACPI / tables: Check if id is NULL in acpi_table_parse() ACPI / proc: Include appropriate header file in proc.c ACPI / EC: Remove unused functions and add prototype declaration in internal.h ACPI / dock: Include appropriate header file in dock.c ACPI / PCI: Include appropriate header file in pci_link.c ACPI / PCI: Include appropriate header file in pci_slot.c ACPI / EC: Mark the function acpi_ec_add_debugfs() as static in ec_sys.c ACPI / NVS: Include appropriate header file in nvs.c ACPI / OSL: Mark the function acpi_table_checksum() as static ACPI / processor: initialize a variable to silence compiler warning ACPI / processor: use ACPI_COMPANION() to get ACPI device ACPI: correct minor typos ACPI / sleep: Drop redundant acpi_disabled check ACPI / dock: Drop redundant acpi_disabled check ACPI / table: Replace '1' with specific error return values ACPI: remove trailing whitespace ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h> SFI / ACPI: Fix warnings reported during builds with W=1 ... Conflicts: drivers/acpi/nvs.c drivers/hwmon/asus_atk0110.c		2014-01-12 23:44:09 +01:00
..
apei-base.c	ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>	2013-12-07 01:24:33 +01:00
apei-internal.h	ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>	2013-12-07 01:24:33 +01:00
einj.c	ACPI: Clean up inclusions of ACPI header files	2013-12-07 01:03:14 +01:00
erst-dbg.c	ACPI / APEI: Fix the returned value in erst_dbg_read	2013-01-03 13:10:20 +01:00
erst.c	pstore: Don't allow high traffic options on fragile devices	2013-12-20 13:12:01 -08:00
ghes.c	ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>	2013-12-07 01:24:33 +01:00
hest.c	x86/mce, acpi/apei: Only disable banks listed in HEST if mce is configured	2013-08-12 17:55:12 +02:00
Kconfig	x86/efi: Don't select EFI from certain special ACPI drivers	2013-12-19 21:32:46 +01:00
Makefile	Move cper.c from drivers/acpi/apei to drivers/firmware/efi	2013-10-31 11:27:04 -07:00