From: Rafael J. Wysocki Date: Mon, 6 Jan 2014 21:54:55 +0000 (+0100) Subject: Merge branch 'acpi-cleanup' X-Git-Tag: next-20140107~67^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c362d4163479cc2edc13726db8827c51df888ff2;p=karo-tx-linux.git 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 inclusion in iSCSI boot firmware module ACPI / i915: Fix incorrect inclusions via SFI / ACPI: Fix warnings reported during builds with W=1 ... Conflicts: drivers/acpi/nvs.c drivers/hwmon/asus_atk0110.c --- c362d4163479cc2edc13726db8827c51df888ff2