summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-05-28 22:18:12 +0200
committerLen Brown <len.brown@intel.com>2010-05-28 22:18:12 +0200
commit64a4222f7e087b5030eff0f6e47285696089d983 (patch)
tree43f89acec1245d6cc44967d26eb49447e9beed74 /drivers/acpi
parentMerge branch 'acpi_enable' into release (diff)
parentACPI: video: fix acpi_backlight=video (diff)
parentACPI: Export EDID blocks to the kernel (diff)
downloadlinux-64a4222f7e087b5030eff0f6e47285696089d983.tar.xz
linux-64a4222f7e087b5030eff0f6e47285696089d983.zip
Merge branches 'video' and 'video-edid' into release