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

Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig

1 files changed, 5 insertions, 2 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index d9cb020029b9..1483243edf14 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -282,8 +282,11 @@ out_uninit_applicant:
         if (ngrp)
                 vlan_gvrp_uninit_applicant(real_dev);
 out_free_group:
-        if (ngrp)
-                vlan_group_free(ngrp);
+        if (ngrp) {
+                hlist_del_rcu(&ngrp->hlist);
+                /* Free the group, after all cpu's are done. */
+                call_rcu(&ngrp->rcu, vlan_rcu_free);
+        }
         return err;
 }