Merge branch 'bugzilla-13931-sleep-nvs' into release
authorLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 05:15:40 +0000 (01:15 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 05:15:40 +0000 (01:15 -0400)
commit42de5532f4a58a52a60bdd8bd4f80f9f210dd65b
treef624579c4c27e1ffcba5e4141fcc0877c3a6ae56
parente9e8b4dd142da3b6cbf301ba922804d6cdc31a17
parent2a6b69765ad794389f2fc3e14a0afa1a995221c2
Merge branch 'bugzilla-13931-sleep-nvs' into release

Conflicts:
drivers/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/sleep.c