projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7f46b7 c121638)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jan 2012 03:36:08 +0000 (19:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jan 2012 03:36:08 +0000 (19:36 -0800)
commit733bbb7e1c3acb8fabc55595bf1df8973dde7736
tree779bc62fda19d2176ff7059fa59b0932c9ebc4c5tree | snapshot
parentc7f46b7aa4ae5cbef32eb5e016512a14f936affacommit | diff
parentc121638277a71c1e1fb44c3e654ea353357bbc2ccommit | diff
Merge git://git./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
Domain: System / Kernel;