Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release
Len Brown [Sun, 5 Apr 2009 05:51:10 +0000 (01:51 -0400)]
1  2  3 
drivers/acpi/ec.c

Simple merge