]> 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>
Mon, 7 Jun 2010 00:42:02 +0000 (17:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Jun 2010 00:42:02 +0000 (17:42 -0700)
commit6dd3d7c8fd0db473dce99fe9be4d4962e04e3dbb
tree95c566c6238cc953e1e336115d2daafe8bcb388f
parente4bb206147c071c1ccae5d7fdcdfb58aeb872dec
parent27f89414ac4e5622a5a97ae5a1d47d92b3e90861
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/sfc/net_driver.h
drivers/net/sfc/siena.c
13 files changed:
drivers/net/benet/be_cmds.c
drivers/net/fec.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ppp_generic.c
drivers/net/r8169.c
drivers/net/sfc/net_driver.h
include/net/sock.h
net/core/dev.c
net/ipv4/syncookies.c
net/ipv4/tcp_ipv4.c
net/ipv6/mcast.c
net/ipv6/udp.c
net/mac80211/rx.c