From: Linus Torvalds Date: Sat, 26 Apr 2008 16:26:39 +0000 (-0700) Subject: Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Tag: v2.6.26-rc1~1048 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4d9c55e44336602f8b2880b972fb55f67bc51dd0;p=~shefty%2Frdma-dev.git 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 --- 4d9c55e44336602f8b2880b972fb55f67bc51dd0