mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/ath5k/base.c net/8021q/vlan_core.c
This commit is contained in:
commit
9eeda9abd1
739 changed files with 7273 additions and 6642 deletions
|
|
@ -989,7 +989,6 @@ static int sock_close(struct inode *inode, struct file *filp)
|
|||
printk(KERN_DEBUG "sock_close: NULL inode\n");
|
||||
return 0;
|
||||
}
|
||||
sock_fasync(-1, filp, 0);
|
||||
sock_release(SOCKET_I(inode));
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue