Merge tag 'v3.6-rc4' into asoc-omap

Linux 3.6-rc4

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index f9347ea3d381..b3321129a83c 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -640,15 +640,9 @@ static int netconsole_netdev_event(struct notifier_block *this,
                                  * rtnl_lock already held
                                  */
                                 if (nt->np.dev) {
-                                        spin_unlock_irqrestore(
-                                                              &target_list_lock,
-                                                              flags);
                                         __netpoll_cleanup(&nt->np);
-                                        spin_lock_irqsave(&target_list_lock,
-                                                          flags);
                                         dev_put(nt->np.dev);
                                         nt->np.dev = NULL;
-                                        netconsole_target_put(nt);
                                 }
                                 nt->enabled = 0;
                                 stopped = true;