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)
1  2 
drivers/acpi/sleep.c

Simple merge