]> git.neil.brown.name Git - history.git/commitdiff
Merge intel.com:/home/lenb/src/26-stable-dev
authorLen Brown <len.brown@intel.com>
Tue, 30 Nov 2004 12:11:31 +0000 (07:11 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 30 Nov 2004 12:11:31 +0000 (07:11 -0500)
into intel.com:/home/lenb/src/26-latest-dev

1  2 
arch/i386/kernel/acpi/boot.c

Simple merge