Merge branch 'mainline' into upstream-linus

author Stefan Richter <stefanr@s5r6.in-berlin.de>

Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)

committer Stefan Richter <stefanr@s5r6.in-berlin.de>

Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)
author Stefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)
committer Stefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)
diff --cc Documentation/feature-removal-schedule.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Stefan Richter <stefanr@s5r6.in-berlin.de>
	Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)
committer	Stefan Richter <stefanr@s5r6.in-berlin.de>
	Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)
		1	2
Documentation/feature-removal-schedule.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history