From: Len Brown <len.brown@intel.com>
Date: Wed, 25 Jul 2007 05:36:31 +0000 (-0400)
Subject: Pull d-states into release branch
X-Git-Tag: v2.6.23-rc2~273^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4;p=pandora-kernel.git

Pull d-states into release branch

Conflicts:

	drivers/acpi/sleep/main.c

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

cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4
Reading git-diff-tree failed