| commit | f398778aa336a2919ee04ba45d915007230c6957 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Tue Nov 11 21:15:50 2008 -0500 |
| committer | Len Brown <len.brown@intel.com> | Tue Nov 11 21:15:50 2008 -0500 |
| tree | c7244cd1d4af8d99c861b21ebcaeabf23e355b9f | |
| parent | 9b5a56ddfd615a27e3a0856ceae1592a24021e42 [diff] | |
| parent | 2dba1b5d87e08a294da5cdfa4d32908000e9b085 [diff] |
Merge branch 'video' into release Conflicts: Documentation/kernel-parameters.txt Signed-off-by: Len Brown <len.brown@intel.com>