Merge branch 'nvs' into release
authorLen Brown <len.brown@intel.com>
Sun, 15 Aug 2010 03:55:44 +0000 (23:55 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 15 Aug 2010 03:55:44 +0000 (23:55 -0400)
commitf2a66185bed21427d8d347a42eaf0ad1d3d9fc63
treede49c1ea5b87273596725d9bb1b0188ae2bbf3c9
parent9fe6206f400646a2322096b56c59891d530e8d51
parent618d7fd0d4e51a45d25d9bc6097a0cb1e5a2f226
Merge branch 'nvs' into release
drivers/acpi/sleep.c