]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 17:58:40 +0000 (09:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 17:58:40 +0000 (09:58 -0800)
commitad4a03917758e17cf1cb152dc1f24a39e3341196
tree5082ab8e5ea5abc0254c23a3733f1fb3822846a0
parent428febb3a76e6c92d8b7b55894916c5eb6881be0
parentccf791f6fd4f47c8f96c0a12453d5bc7c51e42e2
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