From: Len Brown <len.brown@intel.com>
Date: Fri, 16 Jun 2006 02:19:31 +0000 (-0400)
Subject: ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
X-Git-Tag: v2.6.18-rc1~1081^2~19^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=785fcccd68bd4dc436f75fd4cd40e8557966c86d;p=pandora-kernel.git

ACPI: resolve merge conflict between sem2mutex and processor_perflib.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

Reading git-diff-tree failed