From: Linus Torvalds Date: Sat, 24 Jun 2006 21:48:43 +0000 (-0700) Subject: Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Tag: v2.6.18-rc1~1073 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=abb1cf3cb9532d824c8bda00a111adb106dd457d;p=linux-2.6-omap-h63xx.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: radeon constify radeon microcode Add i915 ioctls to configure pipes for vblank interrupt. drm: update radeon to 1.25 add r200 vertex program support drm: radeon add a tcl state flush before accessing tcl vector space --- abb1cf3cb9532d824c8bda00a111adb106dd457d