Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
commitb55d1b1814c52463c11707f53dbdc223e09b2924
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Nov 2007 02:00:35 +0000 (4 18:00 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Nov 2007 02:00:35 +0000 (4 18:00 -0800)
tree4b9ca29e6601b80fdd6aaff7e62bf55b30b2fe07
parentaa641935343e05795f7f7289e7b242138b612ffe
parent038477aa15df6557ef0c8b2b60523c81eae58ee9
Merge branch 'drm-patches' of /linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/sis: missing mutex unlock in error path.
  radeon: set the address to access the GART table on the CPU side correctly