From: Len Brown <len.brown@intel.com>
Date: Wed, 23 Mar 2011 06:34:54 +0000 (-0400)
Subject: Merge branch 'linus' into release
X-Git-Tag: v2.6.39-rc1~90^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02e2407858fd62053bf60349c0e72cd1c7a4a60e;p=pandora-kernel.git

Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/acpi/sleep.c

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

02e2407858fd62053bf60349c0e72cd1c7a4a60e
Reading git-diff-tree failed