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

Browse source

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>

...

This commit is contained in:

Pablo Neira Ayuso 2014-03-07 11:31:29 +01:00

parent 07cf8f5ae2 411fd527bc

commit 52af2bfcc0

2 changed files with 7 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/netfilter/ipvs/ip_vs_ctl.c

View file

13

net/netfilter/ipvs/ip_vs_lblc.c

View file