| commit | a80c69fc08064942ba5038310cd63c42b1d8ed72 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Jun 15 17:43:48 2015 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Jun 15 17:43:48 2015 +0200 |
| tree | c81768b6287397efe9b13fb80bad06ac9513d7da | |
| parent | 49e4d842f0d0892c3d26c93a81b9f22c1467030e [diff] | |
| parent | c0165304e10f317672e20f2b40770d74c51e287f [diff] |
Merge branch 'topic/atomic-conversion' into drm-intel-next-queued The i915 atomic conversion is a real beast and it's not getting easier wrangling in a separate branch. I'm might be regretting this, but right after vacation nothing can burst my little bubble here! Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>