| commit | 30ef898c535bffd105c1a9b9b6563969b3deb31e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 03 09:58:40 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 03 09:58:40 2008 -0800 |
| tree | 5082ab8e5ea5abc0254c23a3733f1fb3822846a0 | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 [diff] | |
| parent | 5a125c3c79167e78ba44efef03af7090ef28eeaf [diff] |
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