tree 71461989ebe8a20258ca4b0be341b755594a2b0b
parent 6b62b3e134676687d5d666e6edc3b45f1507b2b7
parent 06d1ee32a4d25356a710b49d5e95dbdd68bdf505
author Dave Airlie <airlied@redhat.com> 1444954232 +1000
committer Dave Airlie <airlied@redhat.com> 1444955128 +1000

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