]> err.no Git - linux-2.6/commitdiff
Merge branches 'release' and 'stats' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:13:36 +0000 (03:13 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:13:36 +0000 (03:13 -0500)
1  2 
drivers/acpi/events/evgpe.c
drivers/acpi/osl.c
include/linux/acpi.h

Simple merge
Simple merge
Simple merge