]> 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, 27 Dec 2010 06:37:05 +0000 (22:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Dec 2010 06:37:05 +0000 (22:37 -0800)
commit4b6a36ff855572eb3760f611155a07236914e1cf
tree14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a
parent955b34b6701c937de2a4b2046cbee54f177d4e67
parentb7b7df02c448a7f53e5a0e07011af39fa909dcae
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
net/ipv4/fib_frontend.c
12 files changed:
MAINTAINERS
drivers/infiniband/hw/mlx4/main.c
drivers/net/Kconfig
drivers/net/atl1c/atl1c_main.c
drivers/net/sundance.c
include/net/flow.h
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/ipv4/tcp_ipv4.c
net/mac80211/Kconfig
net/mac80211/rx.c
security/selinux/hooks.c