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

Conflicts:

	drivers/net/ppp_generic.c

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

diff --cc drivers/net/jme.h
Simple merge

diff --cc drivers/net/phy/mdio_bus.c
Simple merge

diff --cc drivers/net/ppp_generic.c
index c832d60,714a230..06b4482
--- 1/drivers/net/ppp_generic.c
--- 2/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@@ -2484,19 -2498,17 +2484,17 @@@ init_ppp_file(struct ppp_file *pf, int 
   */
  static void ppp_shutdown_interface(struct ppp *ppp)
  {
-       struct net_device *dev;
- 
        mutex_lock(&all_ppp_mutex);
-       ppp_lock(ppp);
-       dev = ppp->dev;
-       ppp->dev = NULL;
-       ppp_unlock(ppp);
        /* This will call dev_close() for us. */
-       if (dev) {
-               unregister_netdev(dev);
-               free_netdev(dev);
-       }
+       ppp_lock(ppp);
+       if (!ppp->closing) {
+               ppp->closing = 1;
+               ppp_unlock(ppp);
+               unregister_netdev(ppp->dev);
+       } else
+               ppp_unlock(ppp);
+ 
 -      cardmap_set(&all_ppp_units, ppp->file.index, NULL);
 +      unit_put(&ppp_units_idr, ppp->file.index);
        ppp->file.dead = 1;
        ppp->owner = NULL;
        wake_up_interruptible(&ppp->file.rwait);

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

diff --cc net/bluetooth/rfcomm/core.c
Simple merge

diff --cc net/socket.c
Simple merge