Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into...
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Thu, 17 May 2007 17:35:07 +0000 (10:35 -0700)
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Thu, 17 May 2007 17:35:07 +0000 (10:35 -0700)
commitb7bf317f42915dc4f5fde4a696e37985cea45104
tree7101a08e7a10e0a74ac3971b99aeaee6ed1f888f
parenta18b4befb9b76c4b2662ff6caa0e4f0975eb8e9c
parentfd63ea971322246734fca5977a800c3ef51cc3fe
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101

Conflicts:

linux-core/drm_crtc.c
linux-core/drm_fb.c

Lots of changes to merge with alanh's latest stuff:
  o fix use of fb->pitch now that it has the right value
  o add new helper for finding the CRTC given an FB
  o fix new fb_probe/fb_remove functions to take a CRTC
  o fixup callers of new FB routines
  o port drm_fb changes to intel_fb
  o check for errors after creating fb buffer object
  o go back to using cfb_imageblit since the accel stubs aren't ready
linux-core/drmP.h
linux-core/drm_crtc.c
linux-core/drm_fb.c
linux-core/drm_objects.h
linux-core/intel_display.c
linux-core/intel_drv.h
linux-core/intel_fb.c
shared-core/i915_drv.h
shared-core/i915_init.c