Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Tue, 16 May 2006 00:19:52 +0000 (01:19 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Tue, 16 May 2006 00:19:52 +0000 (01:19 +0100)
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge