mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c net/llc/af_llc.c
This commit is contained in:
commit
fe6c791570
84 changed files with 824 additions and 516 deletions
|
|
@ -398,6 +398,7 @@ void __exit x25_link_free(void)
|
|||
list_for_each_safe(entry, tmp, &x25_neigh_list) {
|
||||
nb = list_entry(entry, struct x25_neigh, node);
|
||||
__x25_remove_neigh(nb);
|
||||
dev_put(nb->dev);
|
||||
}
|
||||
write_unlock_bh(&x25_neigh_list_lock);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue