Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...
authorJeff Garzik <jeff@garzik.org>
Sun, 28 May 2006 20:35:13 +0000 (16:35 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 28 May 2006 20:35:13 +0000 (16:35 -0400)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge