summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/sis
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-12-21 13:50:56 +0400
committerDave Airlie <airlied@redhat.com>2011-12-21 13:50:56 +0400
commit4cf73129cbe001b41be2f8b56f763fbf3acaa4ce (patch)
tree2cdde82f48800ae1746775bab7e4f3c5f1fc3b88 /drivers/gpu/drm/sis
parent3e54f5b72b44a5b905dc56442b147b0ee0475a1d (diff)
parent6abff3c78051e40130a1c653f874fb12b9d40254 (diff)
downloadlinux-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 'drivers/gpu/drm/sis')
0 files changed, 0 insertions, 0 deletions