| commit | 98ca74f4d5b44e58d926a38ae160f1ff9573687e | [log] [tgz] |
|---|---|---|
| author | Pablo Neira Ayuso <pablo@netfilter.org> | Mon Jun 16 13:20:39 2014 +0200 |
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | Mon Jun 16 13:22:33 2014 +0200 |
| tree | 986868f47c88fe737e58c07db9a4c2ed9180a333 | |
| parent | 915136065b7ca75af4cae06281e4dc43926edbfe [diff] | |
| parent | 9802d21e7a0b0d2167ef745edc1f4ea7a0fc6ea3 [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>