| commit | 336879b1da97fffc097f77c6d6f818660f2826f0 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Sep 11 14:46:53 2014 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Sep 11 14:46:53 2014 +0200 |
| tree | 4ddb4d1c5d2b67fb096c72e41d2a03b01a605041 | |
| parent | 3d3cbd84300e7be1e53083cac0f6f9c12978ecb4 [diff] | |
| parent | fdcaa1dbb7c6ed419b10fb8cdb5001ab0a00538f [diff] |
Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework Dave asked me to do the backmerge before sending him the revised pull request, so here we go. Nothing fancy in the conflicts, just a few things changed right next to each another. Conflicts: drivers/gpu/drm/drm_irq.c Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>