Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2010 19:44:44 +0000 (11:44 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2010 19:44:44 +0000 (11:44 -0800)
commitb1109bf085c8dd69537b7876ea83f914dd1fe46a
tree086bd9891a8c92284ea148c93f2242e6c7c02bd2
parent889b8f964f2f226b7cd5a0a515109e3d8d9d1613
parent44bfce5c3ec91baf8ffcd075c66711740f29a949
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
MAINTAINERS
drivers/net/cxgb3/sge.c
drivers/net/igb/igb_main.c