]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commit2b1c4354de72ced917d2f3fe88117613f992234b
tree3e7643cad45d94e3c331366418532043bd4fa5a9
parent5e140dfc1fe87eae27846f193086724806b33c7d
parent170ebf85160dd128e1c4206cc197cce7d1424705
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