| commit | 47bf31adc541bef0c20de15e800e0011f1ae70c7 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Wed Oct 22 23:25:26 2008 -0400 |
| committer | Len Brown <len.brown@intel.com> | Wed Oct 22 23:25:26 2008 -0400 |
| tree | 28903879a8570eaefa57942ec3d475d365f5a465 | |
| parent | 4538fad56ee1c16bce0294b5647d2551f0e03164 [diff] | |
| parent | 0a918a9432cc30aede10f904253b66ea6ab485ac [diff] |
Merge branch 'dock' into test Conflicts: drivers/acpi/osl.c Signed-off-by: Len Brown <len.brown@intel.com>