diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-21 09:50:56 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-21 09:50:56 (GMT) |
| commit | 4cf73129cbe001b41be2f8b56f763fbf3acaa4ce (patch) | |
| tree | 2cdde82f48800ae1746775bab7e4f3c5f1fc3b88 /include/drm/sis_drm.h | |
| parent | 3e54f5b72b44a5b905dc56442b147b0ee0475a1d (diff) | |
| parent | 6abff3c78051e40130a1c653f874fb12b9d40254 (diff) | |
| download | linux-fsl-qoriq-4cf73129cbe001b41be2f8b56f763fbf3acaa4ce.tar.xz | |
Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next
-next reported a messy merge, so I've merged my upstream pull into
my -next tree.
Conflicts:
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Diffstat (limited to 'include/drm/sis_drm.h')
0 files changed, 0 insertions, 0 deletions