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

Merge branch 'linus' into sfi-release

Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c

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

c602c65b2f81d14456771d1e3f15d1381f4b7efa
Reading git-diff-tree failed