Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 3 May 2006 12:30:35 +0000 (13:30 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 3 May 2006 12:30:35 +0000 (13:30 +0100)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge