Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 May 2011 21:59:02 +0000 (14:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 May 2011 21:59:02 +0000 (14:59 -0700)
commit7143b7d41218d4fc2ea33e6056c73609527ae687
tree9a842daee1deb57a2c8084bc5d300f6d8428fe34
parent90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2
parent87e9af6cc67d842cd92b52b81f3f14e665e7ab05
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/tg3.c
13 files changed:
MAINTAINERS
drivers/net/bnx2.c
drivers/net/mii.c
drivers/net/tg3.c
drivers/net/usb/smsc95xx.c
drivers/net/usb/usbnet.c
drivers/net/veth.c
drivers/net/wireless/iwlegacy/iwl4965-base.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/core/dev.c
net/ipv4/fib_trie.c
net/ipv6/addrconf.c
net/ipv6/esp6.c