| commit | 48f87dd146a480c723774962eca675873a8aa1da | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Oct 16 10:10:32 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Oct 16 10:25:28 2015 +1000 |
| tree | 71461989ebe8a20258ca4b0be341b755594a2b0b | |
| parent | 6b62b3e134676687d5d666e6edc3b45f1507b2b7 [diff] | |
| parent | 06d1ee32a4d25356a710b49d5e95dbdd68bdf505 [diff] |
Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next Backmerge the drm-fixes pull from Linus's tree into drm-next. This is to fix some conflicts and make future pulls cleaner