]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 78488df 9049fb6)
Merge branch 'ipvs'
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 16 Jun 2014 11:20:39 +0000 (13:20 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 16 Jun 2014 11:22:33 +0000 (13:22 +0200)
commit9bd73f469bce11bf47936dc5b470662463c62a3f
tree986868f47c88fe737e58c07db9a4c2ed9180a333tree | snapshot
parent78488dff444be33df50ece0839268377f59be4e3commit | diff
parent9049fb6769e4d4317b1185d1cf793407a9aca2a9commit | diff
Merge branch 'ipvs'

Simon Horman says:

====================
Fix for panic due use of tot_stats estimator outside of CONFIG_SYSCTL

It has been present since v3.6.39.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Linux Kernel Source Tree.