]> 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>
Tue, 3 Aug 2010 05:22:46 +0000 (22:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Aug 2010 05:22:46 +0000 (22:22 -0700)
commitfdd3ceffb6a017f49209f65de069ee1bb39ff3b7
tree652199eacee32c2cf317f5a54da8265973d29978
parent905158eaea412a16220328fa87607002b2126e28
parent8832108c47f80bc12988682ce4d06b227c43d33c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/e1000e/hw.h
net/bridge/br_device.c
net/bridge/br_input.c
drivers/net/e1000e/hw.h
net/bridge/br_device.c
net/bridge/br_fdb.c
net/bridge/br_input.c
net/bridge/br_stp_bpdu.c
net/ipv4/tcp.c
net/sched/act_nat.c