]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 20 Mar 2009 09:27:41 +0000 (02:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Mar 2009 09:27:41 +0000 (02:27 -0700)
commit03b86544da537cd94780c1015c5185363a99ec10
tree3e7643cad45d94e3c331366418532043bd4fa5a9
parent3064a54a773f5c0e56e7be230a4f74aa12bab832
parentb2e361163700b70e72b076acd539214bdd50caab
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/virtio_net.c
drivers/net/bnx2.c
drivers/net/bonding/bond_main.c
drivers/net/smsc911x.c
drivers/net/virtio_net.c
net/core/dev.c
net/ipv6/sit.c