]> 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, 30 Jan 2009 22:31:07 +0000 (14:31 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Jan 2009 22:31:07 +0000 (14:31 -0800)
commit05bee4737774881e027bfd9a8b5c40a7d68f6325
tree5fd32eb8fe345d2d30e85910beac241a4439e8cd
parent80595d59ba9917227856e663da249c2276a8628d
parent905db44087855e3c1709f538ecdc22fd149cadd8
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/e1000/e1000_main.c
14 files changed:
drivers/net/e1000/e1000_main.c
drivers/net/r6040.c
drivers/net/sfc/efx.c
drivers/net/sfc/efx.h
drivers/net/sfc/net_driver.h
drivers/net/sfc/sfe4001.c
drivers/net/sfc/tenxpress.c
drivers/net/smsc911x.c
drivers/net/smsc9420.c
drivers/net/ucc_geth.c
drivers/net/virtio_net.c
include/net/inet_hashtables.h
net/core/skbuff.c
net/ipv4/tcp.c