| commit | 193a6dec1c0246a80b6d0101e4f351ccf877bcac | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Sat Sep 19 02:31:39 2009 -0400 |
| committer | Len Brown <len.brown@intel.com> | Sat Sep 19 02:31:39 2009 -0400 |
| tree | 2f0f0ff70241ae8c9dc0c07c3369c0bf96956b14 | |
| parent | 53de5356be3ac62c22ae1da266943059b169d9b1 [diff] | |
| parent | 90c53ca426cb93d15eefea79dcf6bd15ad3ffeb4 [diff] |
Merge branch 'video' into release Conflicts: drivers/acpi/video.c Signed-off-by: Len Brown <len.brown@intel.com>