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
..
cgroup	cgroups: fix cgroup_event_listener error handling	2013-01-08 10:00:44 -08:00
firewire	tools/firewire: nosy-dump: check for allocation failure	2012-12-02 20:10:18 +01:00
hv	Tools: hv: use single send+recv buffer	2013-09-26 12:03:31 -07:00
include/tools	tools/include: use stdint types for user-space byteshift headers	2013-07-03 16:02:28 +02:00
lguest	tools/lguest: offer VIRTIO_F_ANY_LAYOUT for net device.	2013-07-15 11:18:32 +09:30
lib	tools lib traceevent: Fix conversion of pointer to integer of different size	2013-11-19 16:37:59 -03:00
net	filter: add minimal BPF JIT image disassembler	2013-03-21 11:35:41 -04:00
nfsd	NFSD: Added fault injection script	2011-11-07 21:10:47 -05:00
perf	perf header: Fix possible memory leaks in process_group_desc()	2013-11-19 10:34:05 -03:00
power	Merge branch 'acpi-cleanup'	2014-01-12 23:44:09 +01:00
scripts	tools: Harmonize the various build messages in perf, lib-traceevent, lib-lk	2013-10-11 12:18:08 -03:00
testing	H8/300 has been dead for several years, the kernel for it has	2013-11-12 14:13:14 +09:00
thermal/tmon	tools/thermal: Introduce tmon, a tool for thermal subsystem	2013-11-07 08:45:34 +08:00
usb	usb: tools: fix a regression issue that gcc can't link to pthread	2013-12-04 15:10:54 -08:00
virtio	virtio_test: verify if virtqueue_kick() succeeded	2013-10-29 11:28:16 +10:30
vm	tools/vm/page-types.c: support KPF_SOFTDIRTY bit	2013-11-13 12:09:07 +09:00
Makefile	tools/thermal: Introduce tmon, a tool for thermal subsystem	2013-11-07 08:45:34 +08:00