projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9151360 9802d21)
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)
commit98ca74f4d5b44e58d926a38ae160f1ff9573687e
tree986868f47c88fe737e58c07db9a4c2ed9180a333tree | snapshot
parent915136065b7ca75af4cae06281e4dc43926edbfecommit | diff
parent9802d21e7a0b0d2167ef745edc1f4ea7a0fc6ea3commit | 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>
Domain: System / Kernel;