| commit | f02f465b1cdcdf7485f89ec019e6cceaf80cadd5 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Wed Dec 16 03:33:28 2009 -0500 |
| committer | Len Brown <len.brown@intel.com> | Wed Dec 16 03:33:28 2009 -0500 |
| tree | 4219772e39848f31b9554786de5a18c026dfe2e5 | |
| parent | b6202832b43abb56b90ba8d68e2b9fc53c442fa6 [diff] | |
| parent | 747479a3fb42849fe73b9b1f7545d751bde7d632 [diff] |
Merge branch 'dock' into release Conflicts: drivers/acpi/dock.c Signed-off-by: Len Brown <len.brown@intel.com>