Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/ipv4/fib_frontend.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/atl1c/atl1c_main.c
Simple merge

diff --cc drivers/net/sundance.c
Simple merge

diff --cc include/net/flow.h
Simple merge

diff --cc net/ipv4/fib_frontend.c
index 9f8bb68911e40caa6acacbec1657c1f155b5fcdc,c19c1f739fbadc48d39a87c25c550f49de100db4..1d2cdd43a878b0e9d9f3b53303f00ef8b00d11b6
--- 1/net/ipv4/fib_frontend.c
--- 2/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@@ -158,8 -158,11 +158,7 @@@ static void fib_flush(struct net *net
  struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref)
  {
        struct flowi fl = {
 -              .nl_u = {
 -                      .ip4_u = {
 -                              .daddr = addr
 -                      }
 -              },
 +              .fl4_dst = addr,
-               .flags = FLOWI_FLAG_MATCH_ANY_IIF
        };
        struct fib_result res = { 0 };
        struct net_device *dev = NULL;

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/mac80211/Kconfig
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge