| commit | c89a9f5a42811aa5b2f258e32750c0109f570fc1 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 7 Jan 2009 02:06:44 +0000 (6 18:06 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 7 Jan 2009 02:06:44 +0000 (6 18:06 -0800) | ||
| tree | 53f64a1326f0c3884261ad2160e1b18cc7af5fb6 | treesnapshot (tar.gz zip) |
| parent | db30c70575822cc84d87b5613c19cac24734b99f | commitdiff |
| parent | a75f28419a7efff611a81293d41d0e2137d7591e | commitdiff |
Merge branch 'drm-next' of git://git./linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: fix ordering of driver unload vs agp unload.
drm/i915: Respect the other stolen memory sizes we know of.
drm/i915: Non-mobile parts don't have integrated TV-out.
drm/i915: Add support for integrated HDMI on G4X hardware.
drm/i915: Pin cursor bo and unpin old bo when setting cursor.
drm/i915: Don't allow objects to get bound while VT switched.
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: fix ordering of driver unload vs agp unload.
drm/i915: Respect the other stolen memory sizes we know of.
drm/i915: Non-mobile parts don't have integrated TV-out.
drm/i915: Add support for integrated HDMI on G4X hardware.
drm/i915: Pin cursor bo and unpin old bo when setting cursor.
drm/i915: Don't allow objects to get bound while VT switched.