Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 2027afe405fe..30899901aef5 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1935,14 +1935,14 @@ static int __devexit xennet_remove(struct xenbus_device *dev)
 
         dev_dbg(&dev->dev, "%s\n", dev->nodename);
 
-        unregister_netdev(info->netdev);
-
         xennet_disconnect_backend(info);
 
-        del_timer_sync(&info->rx_refill_timer);
-
         xennet_sysfs_delif(info->netdev);
 
+        unregister_netdev(info->netdev);
+
+        del_timer_sync(&info->rx_refill_timer);
+
         free_percpu(info->stats);
 
         free_netdev(info->netdev);