From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Jan 2012 03:36:08 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=733bbb7e1c3acb8fabc55595bf1df8973dde7736;p=~shefty%2Frdma-dev.git

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
---

733bbb7e1c3acb8fabc55595bf1df8973dde7736