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 /include/acpi | |
| parent | 91dd6964390b331beb731623cb59c4a933ff8162 (diff) | |
| parent | eeb4bcb4771679d7b3446c0293334faee11b090a (diff) | |
| parent | e92a716240258989f19c7345e8b135e6d214431a (diff) | |
| download | linux-3.10-64a4222f7e087b5030eff0f6e47285696089d983.tar.gz linux-3.10-64a4222f7e087b5030eff0f6e47285696089d983.tar.bz2 linux-3.10-64a4222f7e087b5030eff0f6e47285696089d983.zip | |
Merge branches 'video' and 'video-edid' into release