From: Len Brown <len.brown@intel.com>
Date: Sat, 16 Dec 2006 05:59:38 +0000 (-0500)
Subject: ACPI: fix git automerge failure
X-Git-Tag: v2.6.20-rc2~6^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c;p=pandora-kernel.git

ACPI: fix git automerge failure

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

Reading git-diff-tree failed