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

Conflicts:

	net/mac80211/mlme.c
This commit is contained in:
David S. Miller
2008-08-29 23:06:00 -07:00
69 changed files with 642 additions and 470 deletions
+1 -1
View File
@@ -376,7 +376,7 @@ errcopy:
hlist_for_each_safe(p, q, &newtbl->hash_buckets[i])
tbl->free_node(p, 0);
}
__mesh_table_free(tbl);
__mesh_table_free(newtbl);
endgrow:
return NULL;
}