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
..
dvo_ch7xxx.c
dvo_ch7017.c
dvo_ivch.c
dvo_ns2501.c
dvo_sil164.c
dvo_tfp410.c
dvo.h
i915_debugfs.c
i915_dma.c	drm/i915: don't update the dri1 breadcrumb with modesetting	2013-12-11 14:25:58 +01:00
i915_drv.c	drm/i915: Do not clobber config status after a forced restore of hw state	2013-12-03 23:15:46 +01:00
i915_drv.h	Merge branch 'acpi-cleanup'	2014-01-12 23:44:09 +01:00
i915_gem_context.c	drm/i915: Fix use-after-free in do_switch	2013-12-06 13:09:11 +01:00
i915_gem_debug.c
i915_gem_dmabuf.c	drm/i915: Pin pages whilst allocating for dma-buf vmap()	2013-11-29 15:51:20 +01:00
i915_gem_evict.c	drm/i915: Repeat eviction search after idling the GPU	2013-12-10 08:13:58 +01:00
i915_gem_execbuffer.c	drm/i915: Prevent double unref following alloc failure during execbuffer	2013-12-12 10:44:57 +01:00
i915_gem_gtt.c	drm/i915/bdw: Flush system agent on gen8 also	2014-01-06 11:11:04 +01:00
i915_gem_stolen.c
i915_gem_tiling.c
i915_gem.c	drm/i915: Fix erroneous dereference of batch_obj inside reset_status	2013-12-12 10:49:05 +01:00
i915_gpu_error.c
i915_ioc32.c
i915_irq.c
i915_reg.h	drm/i915: Make the DERRMR SRM target global GTT	2013-11-29 14:56:44 +01:00
i915_suspend.c
i915_sysfs.c
i915_trace_points.c
i915_trace.h
i915_ums.c
intel_acpi.c	ACPI: Clean up inclusions of ACPI header files	2013-12-07 01:03:14 +01:00
intel_bios.c
intel_bios.h
intel_crt.c
intel_ddi.c	drm/i915: Check VBT for eDP ports on VLV	2013-11-28 13:42:12 +01:00
intel_display.c	Revert "drm/i915: assume all GM45 Acer laptops use inverted backlight PWM"	2014-01-06 11:16:39 +01:00
intel_dp.c	drm/i915: Simplify DP vs. eDP detection	2013-11-28 13:42:25 +01:00
intel_drv.h	drm/i915: fix pm init ordering	2013-12-06 13:08:15 +01:00
intel_dsi_cmd.c
intel_dsi_cmd.h
intel_dsi_pll.c
intel_dsi.c
intel_dsi.h
intel_dvo.c
intel_fbdev.c
intel_hdmi.c
intel_i2c.c
intel_lvds.c
intel_modes.c
intel_opregion.c	ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>	2013-12-07 01:24:33 +01:00
intel_overlay.c
intel_panel.c
intel_pm.c	drm/i915: get a PC8 reference when enabling the power well	2013-12-13 21:34:57 +01:00
intel_ringbuffer.c
intel_ringbuffer.h
intel_sdvo_regs.h
intel_sdvo.c
intel_sideband.c
intel_sprite.c
intel_tv.c
intel_uncore.c	Merge branch 'bdw-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes	2013-12-12 10:38:08 +10:00
Kconfig
Makefile	ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>	2013-12-07 01:24:33 +01:00