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
..
efi	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-12-29 13:35:04 -08:00
google	DMA-API: firmware/google/gsmi.c: avoid direct access to DMA masks	2013-10-31 14:49:17 +00:00
dcdbas.c	DMA-API: dcdbas: update DMA mask handing	2013-10-31 14:49:16 +00:00
dcdbas.h
dell_rbu.c
dmi_scan.c	dmi: Avoid unaligned memory access in save_mem_devices()	2013-11-03 10:40:12 +01:00
dmi-id.c
dmi-sysfs.c
edd.c	[SCSI] edd: Treat "XPRS" host bus type the same as "PCI"	2011-10-31 13:26:19 +04:00
iscsi_ibft_find.c	efi: Make 'efi_enabled' a function to query EFI facilities	2013-01-30 11:51:59 -08:00
iscsi_ibft.c	switch ->is_visible() to returning umode_t	2012-01-03 22:54:55 -05:00
Kconfig	ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module	2013-12-07 01:24:33 +01:00
Makefile	x86/efi: Don't select EFI from certain special ACPI drivers	2013-12-19 21:32:46 +01:00
memmap.c	firmware, memmap: fix firmware_map_entry leak	2013-04-29 15:54:38 -07:00
pcdp.c	pcdp: use early_ioremap/early_iounmap to access pcdp table	2012-07-30 17:25:11 -07:00
pcdp.h