Daniel Vetter a8cbd45977 Merge branch 'drm-intel-next-fixes' into drm-intel-next ...

So I've sent the first pull request to Dave and I expect his request
for a merge tree any second now ;-)

More seriously I have some pending patches for 3.19 that depend upon
both trees, hence backmerge. Conflicts are all trivial.

Conflicts:
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/intel_display.c

v2: Of course I've forgotten the fixup script for the silent conflict.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

2014-10-21 14:42:30 +02:00

..

drm

Merge branch 'drm-intel-next-fixes' into drm-intel-next

2014-10-21 14:42:30 +02:00

host1x

drm/tegra: Make job submission 64-bit safe

2014-08-04 10:07:36 +02:00

ipu-v3

gpu: ipu-v3: Add ipu_dump()

2014-09-02 14:55:56 +02:00

vga

vgaarb: We can own non-decoded resources

2014-07-08 11:15:09 +10:00

Makefile

gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging

2014-06-04 11:06:52 +02:00