diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-08 02:04:26 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-08 02:04:26 +0100 |
| commit | e876b41ab074561d65f213bf5e0fc68cf5bc7380 (patch) | |
| tree | 5bcbd7e4f7b6ac2a34e61011f8eb2cde90bf8603 /include/drm/i915_component.h | |
| parent | Merge tag 'topic/drm-misc-2015-12-04' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Linux 4.4-rc4 (diff) | |
| download | linux-e876b41ab074561d65f213bf5e0fc68cf5bc7380.tar.xz linux-e876b41ab074561d65f213bf5e0fc68cf5bc7380.zip | |
Back merge tag 'v4.4-rc4' into drm-next
We've picked up a few conflicts and it would be nice
to resolve them before we move onwards.
Diffstat (limited to 'include/drm/i915_component.h')
0 files changed, 0 insertions, 0 deletions