Dave Airlie e8115e79aa Linux 3.18-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM= =kG1Y -----END PGP SIGNATURE----- Merge tag 'v3.18-rc7' into drm-next This fixes a bunch of conflicts prior to merging i915 tree. Linux 3.18-rc7 Conflicts: drivers/gpu/drm/exynos/exynos_drm_drv.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/tegra/dc.c		2014-12-02 10:58:33 +10:00
..
dvo_ch7xxx.c
dvo_ch7017.c
dvo_ivch.c
dvo_ns2501.c
dvo_sil164.c
dvo_tfp410.c
dvo.h
i915_cmd_parser.c	Merge remote-tracking branch 'airlied/drm-next' into HEAD	2014-11-10 10:55:35 +01:00
i915_debugfs.c	drm/i915/skl: Add a debugfs file to dump the DDB allocation	2014-11-07 18:42:09 +01:00
i915_dma.c	Linux 3.18-rc7	2014-12-02 10:58:33 +10:00
i915_drv.c	drm/gem: Warn on illegal use of the dumb buffer interface v2	2014-11-21 12:12:41 +10:00
i915_drv.h	drm/gem: Warn on illegal use of the dumb buffer interface v2	2014-11-21 12:12:41 +10:00
i915_gem_context.c	drm/i915: Move flags describing VMA mappings into the VMA	2014-11-04 14:04:51 +01:00
i915_gem_debug.c
i915_gem_dmabuf.c
i915_gem_evict.c
i915_gem_execbuffer.c	drm/gem: Warn on illegal use of the dumb buffer interface v2	2014-11-21 12:12:41 +10:00
i915_gem_gtt.c	Linux 3.18-rc7	2014-12-02 10:58:33 +10:00
i915_gem_gtt.h	drm/i915: Move flags describing VMA mappings into the VMA	2014-11-04 14:04:51 +01:00
i915_gem_render_state.c	drm/i915 Add golden context support for Gen9	2014-11-04 14:04:55 +01:00
i915_gem_render_state.h
i915_gem_stolen.c	drm/i915: Move flags describing VMA mappings into the VMA	2014-11-04 14:04:51 +01:00
i915_gem_tiling.c	Linux 3.18-rc7	2014-12-02 10:58:33 +10:00
i915_gem_userptr.c	drm/i915: Do not leak pages when freeing userptr objects	2014-09-29 15:31:01 +02:00
i915_gem.c	drm/gem: Warn on illegal use of the dumb buffer interface v2	2014-11-21 12:12:41 +10:00
i915_gpu_error.c	drm/i915: Add gen to the gpu hang ecode	2014-11-07 18:42:22 +01:00
i915_ioc32.c	drm/i915: remove redundant #ifdef CONFIG_COMPAT	2014-10-24 16:34:07 +02:00
i915_irq.c	drm/i915: Make mmio flip wait for seqno in the work function	2014-11-07 18:42:20 +01:00
i915_params.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-10-14 09:39:08 +02:00
i915_reg.h	Merge remote-tracking branch 'airlied/drm-next' into HEAD	2014-11-10 10:55:35 +01:00
i915_suspend.c
i915_sysfs.c	drm/i915: Do not export RC6p and RC6pp if they don't exist	2014-10-24 16:34:00 +02:00
i915_trace_points.c
i915_trace.h
i915_ums.c
intel_acpi.c
intel_audio.c	drm/i915/audio: add DOC comment describing HDA over HDMI/DP	2014-11-07 18:42:19 +01:00
intel_bios.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-10-14 09:39:08 +02:00
intel_bios.h
intel_crt.c	drm/i915: Don't claim that we're resetting PCH ADPA register	2014-10-24 16:34:10 +02:00
intel_ddi.c	drm/i915: make pipe/port based audio valid accessors easier to use	2014-11-07 18:42:18 +01:00
intel_display.c	Linux 3.18-rc7	2014-12-02 10:58:33 +10:00
intel_dp_mst.c	drm: Miscellaneous fixes for v3.19-rc1	2014-11-15 09:37:20 +10:00
intel_dp.c	Linux 3.18-rc7	2014-12-02 10:58:33 +10:00
intel_drv.h	drm/i915: Make mmio flip wait for seqno in the work function	2014-11-07 18:42:20 +01:00
intel_dsi_cmd.c
intel_dsi_cmd.h
intel_dsi_panel_vbt.c
intel_dsi_pll.c
intel_dsi.c	drm/i915: Bikeshed rpm functions name a bit.	2014-10-01 10:52:59 +02:00
intel_dsi.h
intel_dvo.c
intel_fbdev.c	drm/i915: Make intel_pin_and_fence_fb_obj take plane and framebuffer	2014-11-07 18:41:51 +01:00
intel_fifo_underrun.c	drm/i915: kerneldoc for intel_fifo_underrun.c	2014-10-24 16:33:55 +02:00
intel_frontbuffer.c	drm/i915: spelling fixes for frontbuffer tracking kerneldoc	2014-10-01 10:52:57 +02:00
intel_hdmi.c	drm/i915: enable audio codec after port	2014-11-07 18:42:17 +01:00
intel_i2c.c
intel_lrc.c	Merge remote-tracking branch 'airlied/drm-next' into HEAD	2014-11-10 10:55:35 +01:00
intel_lrc.h
intel_lvds.c	drm/i915: Bikeshed rpm functions name a bit.	2014-10-01 10:52:59 +02:00
intel_modes.c
intel_opregion.c	ACPI / i915: Update the condition to ignore firmware backlight change request	2014-09-30 01:11:18 +02:00
intel_overlay.c
intel_panel.c	Linux 3.18-rc7	2014-12-02 10:58:33 +10:00
intel_pm.c	Linux 3.18-rc7	2014-12-02 10:58:33 +10:00
intel_renderstate_gen6.c
intel_renderstate_gen7.c
intel_renderstate_gen8.c	drm/i915 Update Gen8 golden context batch buffer	2014-11-04 14:04:54 +01:00
intel_renderstate_gen9.c	drm/i915 Add golden context support for Gen9	2014-11-04 14:04:55 +01:00
intel_renderstate.h	drm/i915 Add golden context support for Gen9	2014-11-04 14:04:55 +01:00
intel_ringbuffer.c	drm/i915: Fix null pointer dereference in ring cleanup code	2014-11-04 23:22:14 +01:00
intel_ringbuffer.h
intel_runtime_pm.c	drm/i915: Enable pipe-a power well on chv	2014-11-04 23:22:11 +01:00
intel_sdvo_regs.h
intel_sdvo.c	drm/i915: Don't destroy DRM properties in the driver	2014-10-31 18:38:17 +01:00
intel_sideband.c
intel_sprite.c	drm/i915: Use vblank evade mechanism in mmio_flip	2014-11-07 18:41:59 +01:00
intel_tv.c
intel_uncore.c	Revert "drm/i915/vlv: Remove check for Old Ack during forcewake"	2014-11-07 18:42:21 +01:00
Kconfig
Makefile	drm/i915: add new intel audio file to group DP/HDMI audio	2014-11-04 23:21:56 +01:00