| commit | 31f46717997a83bdf6db0dd04810c0a329eb3148 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 26 12:30:09 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 26 12:30:09 2010 -0700 |
| tree | e10ae643fb03226b639d31f07a7ad70a300d448d | |
| parent | 91803b499cca2fe558abad709ce83dc896b80950 [diff] | |
| parent | 2101d6f7ac791e87a274371a07a408f74e40ec49 [diff] |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: agp: amd64, fix pci reference leaks drm/edid: Allow non-fatal checksum errors in CEA blocks drm/radeon/kms: suppress a build warning (unused variable) drm: Fixes linux-next & linux-2.6 checkstack warnings: nouveau: fix acpi_lid_open undefined drm/radeon/kms: release AGP bridge at suspend