| commit | 785fcccd68bd4dc436f75fd4cd40e8557966c86d | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Thu Jun 15 22:19:31 2006 -0400 |
| committer | Len Brown <len.brown@intel.com> | Thu Jun 15 22:19:31 2006 -0400 |
| tree | 92fbac7035de7751a9db89c4761e4bdbac346749 | |
| parent | d42510a0f58c2583c37c8e9b7548e3a68545863a [diff] |
ACPI: resolve merge conflict between sem2mutex and processor_perflib.c Signed-off-by: Len Brown <len.brown@intel.com>