From: Len Brown <len.brown@intel.com>
Date: Sat, 12 Jun 2010 05:15:40 +0000 (-0400)
Subject: Merge branch 'bugzilla-13931-sleep-nvs' into release
X-Git-Tag: v2.6.35-rc4~72^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42de5532f4a58a52a60bdd8bd4f80f9f210dd65b;p=pandora-kernel.git

Merge branch 'bugzilla-13931-sleep-nvs' into release

Conflicts:
	drivers/acpi/sleep.c

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

42de5532f4a58a52a60bdd8bd4f80f9f210dd65b
Reading git-diff-tree failed