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
..
gameport	input: gameport: convert bus code to use dev_groups	2013-10-19 20:02:44 -07:00
joystick	Linux 3.11	2013-09-18 07:58:33 -07:00
keyboard	Input: keyboard - "keycode & KEY_MAX" changes some keycode values	2013-11-25 18:26:17 -08:00
misc	Merge branch 'acpi-cleanup'	2014-01-12 23:44:09 +01:00
mouse	Input: ALPS - add support for DualPoint device on Dell XT2 model	2013-12-05 12:50:18 -08:00
serio	Input: serio - fix sysfs layout	2013-12-09 22:23:26 -08:00
tablet	Merge branch 'next' into for-linus	2013-11-14 17:38:05 -08:00
touchscreen	Input: zforce - fix possible driver hang during suspend	2013-12-15 02:53:13 -08:00
apm-power.c
evbug.c
evdev.c	Input: evdev - fall back to vmalloc for client event buffer	2013-10-31 08:45:42 -07:00
ff-core.c
ff-memless.c
input-compat.c
input-compat.h
input-mt.c
input-polldev.c
input.c	Input: allocate absinfo data when setting ABS capability	2013-12-31 10:53:19 -08:00
joydev.c
Kconfig	Input: mousedev - allow disabling even without CONFIG_EXPERT	2013-10-31 08:46:07 -07:00
Makefile
matrix-keymap.c
mousedev.c
sparse-keymap.c