]> err.no Git - linux-2.6/commitdiff
Pull bugzilla-9327 into release branch
authorLen Brown <len.brown@intel.com>
Wed, 21 Nov 2007 01:07:49 +0000 (20:07 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 21 Nov 2007 01:07:49 +0000 (20:07 -0500)
Conflicts:

drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>
1  2 
drivers/acpi/ec.c
drivers/acpi/processor_core.c

Simple merge
Simple merge