diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-21 14:32:55 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-21 14:42:30 +0200 |
| commit | a8cbd4597799ade2b8a656dac7768c352b58e43a (patch) | |
| tree | e40a5ccc9fc808735f3426f5387e54e291ad4351 /drivers/gpu/drm/tilcdc | |
| parent | b727735732d5b2fde0a88911210215e03e190d11 (diff) | |
| parent | 07c338ce98263a5af631b991dd8f96cff6ca2548 (diff) | |
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>
Diffstat (limited to 'drivers/gpu/drm/tilcdc')
0 files changed, 0 insertions, 0 deletions