Merge infradead.org:/home/torvalds/BK/linux-2.5

author David Woodhouse <dwmw2@infradead.org>

Wed, 11 Sep 2002 22:48:02 +0000 (15:48 -0700)

committer David Woodhouse <dwmw2@infradead.org>

Wed, 11 Sep 2002 22:48:02 +0000 (15:48 -0700)
author David Woodhouse <dwmw2@infradead.org>
Wed, 11 Sep 2002 22:48:02 +0000 (15:48 -0700)
committer David Woodhouse <dwmw2@infradead.org>
Wed, 11 Sep 2002 22:48:02 +0000 (15:48 -0700)
diff --cc include/linux/mm.h
Simple merge
diff --cc include/linux/sched.h
Simple merge
author	David Woodhouse <dwmw2@infradead.org>
	Wed, 11 Sep 2002 22:48:02 +0000 (15:48 -0700)
committer	David Woodhouse <dwmw2@infradead.org>
	Wed, 11 Sep 2002 22:48:02 +0000 (15:48 -0700)
		1	2
include/linux/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history