| commit | 299cfe38081bea6dcd8b882375f6f65a980bccf9 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Thu Feb 07 03:31:17 2008 -0500 |
| committer | Len Brown <len.brown@intel.com> | Thu Feb 07 03:31:17 2008 -0500 |
| tree | e567c1e908d158d6dce155cc5cf1b4eb8c78c514 | |
| parent | 8976b6fd7a0060f72e20d5cec833c03d50874cd1 [diff] | |
| parent | 443dea72d5f428170de6d6e3c4c1a1e2b7632b65 [diff] |
Merge branches 'release' and 'hwmon-conflicts' into release