diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-29 17:35:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-29 17:35:33 -0800 |
| commit | 50b2abed6b0812cbeda9f6dd48cc4c247be80643 (patch) | |
| tree | 43da2b779fafe2d86c63ae1db4725db84b148588 /fs/logfs | |
| parent | 7578ed02e4b08c9b7b07443b44cf0ccfdf55c91e (diff) | |
| parent | aef950b4ba3196622a5bd5e21ab1d63f30658285 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
packet: fix possible dev refcnt leak when bind fail
netem: dont call vfree() under spinlock and BH disabled
netfilter: ctnetlink: fix scheduling while atomic if helper is autoloaded
netfilter: ctnetlink: fix return value of ctnetlink_get_expect()
Diffstat (limited to 'fs/logfs')
0 files changed, 0 insertions, 0 deletions