From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 7 Mar 2014 10:31:29 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
X-Git-Tag: v3.15-rc1~113^2~144^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=52af2bfcc0f1de4d2bf7a292127f9731f08c2c8e;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next

Via Simon Horman:

====================
* Whitespace cleanup spotted by checkpatch.pl from Tingwei Liu.
* Section conflict cleanup, basically removal of one wrong __read_mostly,
  from Andi Kleen.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

52af2bfcc0f1de4d2bf7a292127f9731f08c2c8e