| commit | 733bbb7e1c3acb8fabc55595bf1df8973dde7736 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 01 19:36:08 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 01 19:36:08 2012 -0800 |
| tree | 779bc62fda19d2176ff7059fa59b0932c9ebc4c5 | |
| parent | c7f46b7aa4ae5cbef32eb5e016512a14f936affa [diff] | |
| parent | c121638277a71c1e1fb44c3e654ea353357bbc2c [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: netfilter: ctnetlink: fix timeout calculation ipvs: try also real server with port 0 in backup server skge: restore rx multicast filter on resume and after config changes mlx4_en: nullify cq->vector field when closing completion queue