From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Nov 2008 17:58:40 +0000 (-0800)
Subject: Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.28-rc4~94
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=30ef898c535bffd105c1a9b9b6563969b3deb31e;p=linux-2.6-omap-h63xx.git

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

* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  i915: Add GEM ioctl to get available aperture size.
  drm/radeon: fixup further bus mastering confusion.
  build fix: CONFIG_DRM_I915=y && CONFIG_ACPI=n
---

30ef898c535bffd105c1a9b9b6563969b3deb31e