From: Len Brown <len.brown@intel.com>
Date: Wed, 16 Dec 2009 07:18:36 +0000 (-0500)
Subject: Merge branch 'ost' into release
X-Git-Tag: v2.6.33-rc1~47^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4;p=pandora-kernel.git

Merge branch 'ost' into release

Conflicts:
	include/acpi/processor.h

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

8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4
Reading git-diff-tree failed