tree a277bf91fb6458476899b90c7dfb9ae22403d400
parent 50704516f334d5036c09b0ecc0064598f7c5596f
parent b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589
author Linus Torvalds <torvalds@linux-foundation.org> 1209227199 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209227199 -0700

Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: _end is shadowing real _end, just rename it.
  drm/vbl rework: rework how the drm deals with vblank.
  drm: reorganise minor number handling using backported modesetting code.
  drm/i915: Handle tiled buffers in vblank tasklet
  drm/i965: On I965, use correct 3DSTATE_DRAWING_RECTANGLE command in vblank
  drm: Remove unneeded dma sync in ATI pcigart alloc
  drm: Fix mismerge of non-coherent DMA patch