Merge branch 'bugzilla-23002' into release
authorLen Brown <len.brown@intel.com>
Tue, 14 Dec 2010 03:40:54 +0000 (22:40 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 14 Dec 2010 03:40:54 +0000 (22:40 -0500)
1  2 
drivers/acpi/sleep.c

Simple merge