]> git.neil.brown.name Git - history.git/commitdiff
Merge intel.com:/home/lenb/src/26-stable-acpica
authorLen Brown <len.brown@intel.com>
Fri, 22 Oct 2004 19:44:20 +0000 (15:44 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 22 Oct 2004 19:44:20 +0000 (15:44 -0400)
into intel.com:/home/lenb/src/26-stable-dev

1  2 
drivers/acpi/osl.c

Simple merge