Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Tue, 9 Feb 2010 19:44:44 +0000 (11:44 -0800)]
1  2 
MAINTAINERS
drivers/net/cxgb3/sge.c
drivers/net/igb/igb_main.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge