summaryrefslogtreecommitdiff
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-26 23:30:09 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-26 23:30:09 +0400
commit31f46717997a83bdf6db0dd04810c0a329eb3148 (patch)
treee10ae643fb03226b639d31f07a7ad70a300d448d /include/linux/acpi.h
parent91803b499cca2fe558abad709ce83dc896b80950 (diff)
parent2101d6f7ac791e87a274371a07a408f74e40ec49 (diff)
downloadlinux-31f46717997a83bdf6db0dd04810c0a329eb3148.tar.xz
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
Diffstat (limited to 'include/linux/acpi.h')
0 files changed, 0 insertions, 0 deletions