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

Conflicts:
	drivers/net/pcmcia/pcnet_cs.c
	net/caif/caif_socket.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

diff --cc drivers/net/pcmcia/pcnet_cs.c
Simple merge

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

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc net/9p/client.c
Simple merge

diff --cc net/caif/caif_socket.c
index abcba5358b63a033de40f511f844f8993c93e724,4bf28f25f368b399a6ef220e06c08c0f5d2621f5..2eca2dd0000fd7dce7fc614ed5e476f0ca886874
--- 1/net/caif/caif_socket.c
--- 2/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@@ -888,14 -897,23 +889,22 @@@ static int caif_connect(struct socket *
                cf_sk->sk.sk_state = CAIF_DISCONNECTED;
                goto out;
        }
-       dev = dev_get_by_index(sock_net(sk), ifindex);
+ 
+       err = -ENODEV;
+       rcu_read_lock();
+       dev = dev_get_by_index_rcu(sock_net(sk), ifindex);
+       if (!dev) {
+               rcu_read_unlock();
+               goto out;
+       }
        cf_sk->headroom = LL_RESERVED_SPACE_EXTRA(dev, headroom);
+       mtu = dev->mtu;
+       rcu_read_unlock();
+ 
        cf_sk->tailroom = tailroom;
-       cf_sk->maxframe = dev->mtu - (headroom + tailroom);
-       dev_put(dev);
+       cf_sk->maxframe = mtu - (headroom + tailroom);
        if (cf_sk->maxframe < 1) {
 -              pr_warning("CAIF: %s(): CAIF Interface MTU too small (%u)\n",
 -                         __func__, mtu);
 +              pr_warn("CAIF Interface MTU too small (%d)\n", dev->mtu);
-               err = -ENODEV;
                goto out;
        }
  

diff --cc net/sunrpc/auth_gss/auth_gss.c
Simple merge