Merge kroah.com:/home/linux/BK/bleed-2.6

author Greg Kroah-Hartman <greg@kroah.com>

Tue, 20 Jan 2004 06:33:30 +0000 (22:33 -0800)

committer Greg Kroah-Hartman <greg@kroah.com>

Tue, 20 Jan 2004 06:33:30 +0000 (22:33 -0800)
author Greg Kroah-Hartman <greg@kroah.com>
Tue, 20 Jan 2004 06:33:30 +0000 (22:33 -0800)
committer Greg Kroah-Hartman <greg@kroah.com>
Tue, 20 Jan 2004 06:33:30 +0000 (22:33 -0800)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Greg Kroah-Hartman <greg@kroah.com>
	Tue, 20 Jan 2004 06:33:30 +0000 (22:33 -0800)
committer	Greg Kroah-Hartman <greg@kroah.com>
	Tue, 20 Jan 2004 06:33:30 +0000 (22:33 -0800)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history