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-05-26 15:09:03 +02:00
2015-10-21 11:35:11 -04:00
2015-01-22 10:42:19 -05:00
2015-12-02 12:45:54 -05:00
2013-09-11 11:44:38 -04:00
2013-09-11 11:44:38 -04:00
2015-12-02 12:45:54 -05:00
2015-05-26 10:31:21 -04:00
2014-03-06 16:46:56 -05:00
2015-10-21 11:35:11 -04:00
2015-12-02 12:45:54 -05:00
2014-12-02 10:58:33 +10:00
2015-11-30 14:44:34 -05:00
2015-12-02 12:45:54 -05:00
2015-12-02 12:45:54 -05:00
2015-05-07 11:00:15 -04:00
2015-09-30 10:44:48 +02:00