]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commit00dad5e479531e379aba7358600cc768725d4f1f
tree652199eacee32c2cf317f5a54da8265973d29978
parentc477d0447db08068a497e7beb892b2b2a7bff64b
parent3a3dfb062c2e086c202d34f09ce29634515ad256
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