tree 779bc62fda19d2176ff7059fa59b0932c9ebc4c5
parent c7f46b7aa4ae5cbef32eb5e016512a14f936affa
parent c121638277a71c1e1fb44c3e654ea353357bbc2c
author Linus Torvalds <torvalds@linux-foundation.org> 1325475368 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325475368 -0800

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