diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-16 06:19:31 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-16 06:19:31 +0400 |
| commit | 785fcccd68bd4dc436f75fd4cd40e8557966c86d (patch) | |
| tree | 92fbac7035de7751a9db89c4761e4bdbac346749 /drivers/acpi/sleep | |
| parent | d42510a0f58c2583c37c8e9b7548e3a68545863a (diff) | |
| download | linux-785fcccd68bd4dc436f75fd4cd40e8557966c86d.tar.xz | |
ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep')
0 files changed, 0 insertions, 0 deletions