mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
13091aa305
4109 changed files with 9649 additions and 34881 deletions
|
|
@ -176,6 +176,7 @@ int lapb_unregister(struct net_device *dev)
|
|||
lapb = __lapb_devtostruct(dev);
|
||||
if (!lapb)
|
||||
goto out;
|
||||
lapb_put(lapb);
|
||||
|
||||
lapb_stop_t1timer(lapb);
|
||||
lapb_stop_t2timer(lapb);
|
||||
|
|
|
|||
Loading…
Reference in a new issue