From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 04:37:13 +0000 (-0400)
Subject: Merge branch 'sfi-base' into release
X-Git-Tag: v2.6.32-rc1~171^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=003d6a38ce1a59e0053a02fd9e9a65b588bc8e33;p=pandora-kernel.git

Merge branch 'sfi-base' into release

Conflicts:
	drivers/acpi/power.c

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

003d6a38ce1a59e0053a02fd9e9a65b588bc8e33
Reading git-diff-tree failed