Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl

Conflicts:
	sound/soc/fsl/fsl_ssi.c

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index dcb21347c670..adeee615dd19 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -684,15 +684,12 @@ restart:
                         case NETDEV_RELEASE:
                         case NETDEV_JOIN:
                         case NETDEV_UNREGISTER:
-                                /*
-                                 * rtnl_lock already held
+                                /* rtnl_lock already held
                                  * we might sleep in __netpoll_cleanup()
                                  */
                                 spin_unlock_irqrestore(&target_list_lock, flags);
 
-                                mutex_lock(&nt->mutex);
                                 __netpoll_cleanup(&nt->np);
-                                mutex_unlock(&nt->mutex);
 
                                 spin_lock_irqsave(&target_list_lock, flags);
                                 dev_put(nt->np.dev);