ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
authorLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 02:19:31 +0000 (22:19 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 02:19:31 +0000 (22:19 -0400)
commit785fcccd68bd4dc436f75fd4cd40e8557966c86d
tree92fbac7035de7751a9db89c4761e4bdbac346749
parentd42510a0f58c2583c37c8e9b7548e3a68545863a
ACPI: resolve merge conflict between sem2mutex and processor_perflib.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/processor_perflib.c