/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
Len Brown [Thu, 4 Aug 2005 03:53:35 +0000 (23:53 -0400)]

Trivial merge