]> err.no Git - linux-2.6/commitdiff
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Nov 2007 02:00:35 +0000 (18:00 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Nov 2007 02:00:35 +0000 (18:00 -0800)
* '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


Trivial merge