]> err.no Git - linux-2.6/commitdiff
Merge ../to-linus-stable/
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
1  2 
Documentation/kernel-parameters.txt
drivers/acpi/osl.c

Simple merge
Simple merge