diff options
author | Len Brown <len.brown@intel.com> | 2010-05-28 16:18:12 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-05-28 16:18:12 -0400 |
commit | 64a4222f7e087b5030eff0f6e47285696089d983 (patch) | |
tree | 43f89acec1245d6cc44967d26eb49447e9beed74 /drivers/acpi | |
parent | Merge branch 'acpi_enable' into release (diff) | |
parent | ACPI: video: fix acpi_backlight=video (diff) | |
parent | ACPI: Export EDID blocks to the kernel (diff) | |
download | linux-dev-64a4222f7e087b5030eff0f6e47285696089d983.tar.xz linux-dev-64a4222f7e087b5030eff0f6e47285696089d983.zip |
Merge branches 'video' and 'video-edid' into release