Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6
authorJeff Garzik <jeff@garzik.org>
Sat, 15 Apr 2006 03:19:41 +0000 (23:19 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 15 Apr 2006 03:19:41 +0000 (23:19 -0400)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge