Backmerge drm-fixes merge into Linus's tree into drm-next.

This merges '5b726e06d6' into drm-next

Just to resolve some merges to make Daniel's life easier.

Signed-off-by: DAve Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2015-12-24 08:08:47 +10:00
commit 20f8e032e6
529 changed files with 4211 additions and 2598 deletions