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
..
2013-10-18 09:12:02 -07:00
2013-10-18 09:12:02 -07:00
2013-10-13 16:16:25 -07:00
2013-08-11 22:10:39 -07:00
2013-08-27 08:28:01 -07:00
2013-10-13 16:16:25 -07:00
2013-08-11 22:10:39 -07:00
2013-09-11 13:01:31 -07:00
2013-08-11 22:10:39 -07:00
2013-08-11 22:10:39 -07:00
2013-08-27 08:28:01 -07:00
2013-09-11 13:01:32 -07:00
2013-08-27 08:28:01 -07:00
2013-06-27 10:29:03 -07:00
2013-08-11 22:10:39 -07:00
2013-10-18 09:12:01 -07:00
2013-03-18 21:19:49 +01:00
2013-08-11 22:10:39 -07:00
2013-08-11 22:10:39 -07:00
2012-11-28 11:50:34 -08:00
2012-10-10 15:25:56 +02:00
2013-08-11 22:10:39 -07:00
2013-10-18 09:12:02 -07:00
2013-08-11 22:10:39 -07:00
2013-08-11 22:10:39 -07:00
2013-08-11 22:10:39 -07:00
2013-08-11 22:10:39 -07:00
2012-11-28 11:49:40 -08:00
2012-11-28 11:49:40 -08:00
2012-11-28 11:50:34 -08:00
2012-11-28 11:50:34 -08:00
2013-08-11 22:10:39 -07:00
2013-09-11 13:01:41 -07:00
2012-11-28 11:50:34 -08:00
2013-08-11 22:10:39 -07:00
2013-10-18 09:12:02 -07:00
2013-10-18 09:12:02 -07:00
2012-11-28 11:50:34 -08:00
2012-11-28 11:50:34 -08:00