commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Mon Mar 14 09:42:34 2016 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Mon Mar 14 09:46:02 2016 +1000 |
tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 | |
parent | 550e3b23a53c88adfa46e64f9d442743e65d47da [diff] | |
parent | 125234dc8b1cc862f52d8bd5b37c36cc59b2cb86 [diff] |
Merge drm-fixes into drm-next. Nouveau wanted this to avoid some worse conflicts when I merge that.