Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 14 Apr 2010 12:01:33 +0000 (05:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 14 Apr 2010 12:01:33 +0000 (05:01 -0700)
commitdad1e54b121d93ed47690d77736af63d3f11d657
tree36fdd29537e43bbb4f36252e010a591ae6fe20bc
parent1253332f75f3774cc84d0b7693152656848901f9
parent0110d6f22f392f976e84ab49da1b42f85b64a3c5
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/virtio_net.c
drivers/net/e1000e/netdev.c
drivers/net/forcedeth.c
drivers/net/igb/igb_ethtool.c
drivers/net/igb/igb_main.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/virtio_net.c