| commit | 4cf73129cbe001b41be2f8b56f763fbf3acaa4ce | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Dec 21 09:50:56 2011 +0000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Dec 21 09:50:56 2011 +0000 |
| tree | 2cdde82f48800ae1746775bab7e4f3c5f1fc3b88 | |
| parent | 3e54f5b72b44a5b905dc56442b147b0ee0475a1d [diff] | |
| parent | 6abff3c78051e40130a1c653f874fb12b9d40254 [diff] |
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