Merge ../to-linus-stable/
commitb857c730d4e960d1876ff56ce5c4bd81ea9ff5ae
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15 15:49 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15 15:49 -0400)
treebce3d877276819174962796954c424c0a09be188
parent2ba84684e8cf6f980e4e95a2300f53a505eb794e
parent30e332f3307e9f7718490a706e5ce99f0d3a7b26
Merge ../to-linus-stable/
Documentation/kernel-parameters.txt
drivers/acpi/osl.c