Auto-update from upstream
Len Brown [Fri, 6 Jan 2006 21:34:21 +0000 (16:34 -0500)]
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS

Simple merge
diff --cc MAINTAINERS
Simple merge