Merge branches 'release' and 'gpe-ack' into release

author Len Brown <[email protected]>

Thu, 7 Feb 2008 08:11:47 +0000 (03:11 -0500)

committer Len Brown <[email protected]>

Thu, 7 Feb 2008 08:11:47 +0000 (03:11 -0500)
author Len Brown <[email protected]>
Thu, 7 Feb 2008 08:11:47 +0000 (03:11 -0500)
committer Len Brown <[email protected]>
Thu, 7 Feb 2008 08:11:47 +0000 (03:11 -0500)
diff --cc drivers/acpi/events/evgpe.c
Simple merge
diff --cc drivers/acpi/osl.c
Simple merge
author	Len Brown <[email protected]>
	Thu, 7 Feb 2008 08:11:47 +0000 (03:11 -0500)
committer	Len Brown <[email protected]>
	Thu, 7 Feb 2008 08:11:47 +0000 (03:11 -0500)
		1	2
drivers/acpi/events/evgpe.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	patch \|	diff1 \|	diff2 \|	blob \| history