]> git.neil.brown.name Git - history.git/commitdiff
Merge intel.com:/home/lenb/bk/linux-2.6.6
authorLen Brown <len.brown@intel.com>
Sun, 2 May 2004 16:39:52 +0000 (12:39 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 2 May 2004 16:39:52 +0000 (12:39 -0400)
into intel.com:/home/lenb/src/linux-acpi-test-2.6.6

1  2 
Documentation/kernel-parameters.txt

Simple merge