]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit735850673f562432afbdd83bf6417200a9121844
treef624579c4c27e1ffcba5e4141fcc0877c3a6ae56
parentb607bf3b10b03e211be7f30c9882d1ca7ac74ef5
parent67926cbeeb5b1a90c08c6bcfa5f835cea3b8fd51
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