Dave Airlie 20f8e032e6 Backmerge drm-fixes merge into Linus's tree into drm-next.
This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next

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

Signed-off-by: DAve Airlie <airlied@redhat.com>
2015-12-24 08:08:47 +10:00
..
2015-06-30 19:44:57 -07:00
2015-04-11 22:27:55 -04:00
2015-11-19 17:51:48 +01:00
2015-11-04 08:23:51 -05:00
2015-04-12 21:03:31 +02:00
2015-11-04 21:50:37 -08:00
2015-11-23 09:44:58 +01:00
2015-11-10 12:07:22 -08:00
2014-12-04 14:34:54 -05:00
2015-01-17 10:02:23 +13:00
2015-11-05 19:34:48 -08:00
2014-12-10 17:41:10 -08:00