Merge branch 'e1000-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6
Jeff Garzik [Tue, 21 Mar 2006 21:40:51 +0000 (16:40 -0500)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge