tree f624579c4c27e1ffcba5e4141fcc0877c3a6ae56
parent e9e8b4dd142da3b6cbf301ba922804d6cdc31a17
parent 2a6b69765ad794389f2fc3e14a0afa1a995221c2
author Len Brown <len.brown@intel.com> 1276319740 -0400
committer Len Brown <len.brown@intel.com> 1276319740 -0400

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

Conflicts:
	drivers/acpi/sleep.c

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