Pull trivial into release branch

author Len Brown <[email protected]>

Thu, 11 Jan 2007 06:55:25 +0000 (01:55 -0500)

committer Len Brown <[email protected]>

Thu, 11 Jan 2007 06:55:25 +0000 (01:55 -0500)
author Len Brown <[email protected]>
Thu, 11 Jan 2007 06:55:25 +0000 (01:55 -0500)
committer Len Brown <[email protected]>
Thu, 11 Jan 2007 06:55:25 +0000 (01:55 -0500)
diff --cc Documentation/feature-removal-schedule.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Len Brown <[email protected]>
	Thu, 11 Jan 2007 06:55:25 +0000 (01:55 -0500)
committer	Len Brown <[email protected]>
	Thu, 11 Jan 2007 06:55:25 +0000 (01:55 -0500)
		1	2
Documentation/feature-removal-schedule.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history