]> err.no Git - linux-2.6/commitdiff
Pull trivial into release branch
authorLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:40:39 +0000 (15:40 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:40:39 +0000 (15:40 -0400)
1  2 
Documentation/kernel-parameters.txt
drivers/acpi/thermal.c

Simple merge
Simple merge