From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 16 Jun 2014 11:20:39 +0000 (+0200)
Subject: Merge branch 'ipvs'
X-Git-Tag: omap-for-v3.16/fixes-rc4~53^2~31^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ca74f4d5b44e58d926a38ae160f1ff9573687e;p=pandora-kernel.git

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

98ca74f4d5b44e58d926a38ae160f1ff9573687e
Reading git-diff-tree failed