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)
commit17f7f4d9fcce8f1b75b5f735569309dee7665968
tree14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a
parent041110a439e21cd40709ead4ffbfa8034619ad77
parentd7c1255a3a21e98bdc64df8ccf005a174d7e6289
Merge branch 'master' of /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