Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
Len Brown [Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)]
1  2 
drivers/acpi/ec.c
drivers/acpi/sleep.c

Simple merge
Simple merge