Auto-update from upstream
Len Brown [Sat, 7 Jan 2006 07:05:40 +0000 (02:05 -0500)]
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS

Simple merge
diff --cc MAINTAINERS
Simple merge