| commit | 42de5532f4a58a52a60bdd8bd4f80f9f210dd65b | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Sat Jun 12 01:15:40 2010 -0400 |
| committer | Len Brown <len.brown@intel.com> | Sat Jun 12 01:15:40 2010 -0400 |
| tree | f624579c4c27e1ffcba5e4141fcc0877c3a6ae56 | |
| parent | e9e8b4dd142da3b6cbf301ba922804d6cdc31a17 [diff] | |
| parent | 2a6b69765ad794389f2fc3e14a0afa1a995221c2 [diff] |
Merge branch 'bugzilla-13931-sleep-nvs' into release Conflicts: drivers/acpi/sleep.c Signed-off-by: Len Brown <len.brown@intel.com>