diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-24 08:08:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-24 08:08:47 +1000 |
| commit | 20f8e032e6dc7053ab803f488e2a8839cd2f69a6 (patch) | |
| tree | 406b662934bffa205d90e9435bf96af7dc1a0cb0 /drivers | |
| parent | ade1ba7346070709856d7e38f8d1a77b7aa710aa (diff) | |
| parent | 5b726e06d6e8309e5c9ef4109a32caf27c71dfc8 (diff) | |
| download | linux-20f8e032e6dc7053ab803f488e2a8839cd2f69a6.tar.gz linux-20f8e032e6dc7053ab803f488e2a8839cd2f69a6.tar.bz2 linux-20f8e032e6dc7053ab803f488e2a8839cd2f69a6.zip | |
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>
Diffstat (limited to 'drivers')