Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

author Jody McIntyre <scjody@modernduck.com>

Fri, 18 Nov 2005 05:18:25 +0000 (00:18 -0500)

committer Jody McIntyre <scjody@modernduck.com>

Fri, 18 Nov 2005 05:18:25 +0000 (00:18 -0500)
author Jody McIntyre <scjody@modernduck.com>
Fri, 18 Nov 2005 05:18:25 +0000 (00:18 -0500)
committer Jody McIntyre <scjody@modernduck.com>
Fri, 18 Nov 2005 05:18:25 +0000 (00:18 -0500)
diff --cc Documentation/feature-removal-schedule.txt
Simple merge
author	Jody McIntyre <scjody@modernduck.com>
	Fri, 18 Nov 2005 05:18:25 +0000 (00:18 -0500)
committer	Jody McIntyre <scjody@modernduck.com>
	Fri, 18 Nov 2005 05:18:25 +0000 (00:18 -0500)