summaryrefslogtreecommitdiffstats
path: root/drivers/net/mvme147.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-04-20 13:16:04 +1000
committerDave Airlie <airlied@redhat.com>2010-04-20 13:16:04 +1000
commit7fff400be6fbf64f10abca9939718aaf1d61c255 (patch)
tree384118628f5c5aa2d74303cddd120de75308beea /drivers/net/mvme147.c
parent0bcb1d844ac638a4c4280f697d5bfac9791e9a70 (diff)
parentb1f201980eb4a7a59277a13cf18acdbb46167ad5 (diff)
downloadblackbird-op-linux-7fff400be6fbf64f10abca9939718aaf1d61c255.tar.gz
blackbird-op-linux-7fff400be6fbf64f10abca9939718aaf1d61c255.zip
Merge branch 'drm-fbdev-cleanup' into drm-core-next
* drm-fbdev-cleanup: drm/fb: remove drm_fb_helper_setcolreg drm/kms/fb: use slow work mechanism for normal hotplug also. drm/kms/fb: add polling support for when nothing is connected. drm/kms/fb: provide a 1024x768 fbcon if no outputs found. drm/kms/fb: separate fbdev connector list from core drm connectors drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list drm/fb: fix fbdev object model + cleanup properly. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/nouveau/nouveau_drv.h
Diffstat (limited to 'drivers/net/mvme147.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud