diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-03-07 11:31:29 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-03-07 11:37:11 +0100 |
| commit | 52af2bfcc0f1de4d2bf7a292127f9731f08c2c8e (patch) | |
| tree | 99763602d04b5ac7b54a12631b58314694118d1e /include/net | |
| parent | 07cf8f5ae2657ac495b906c68ff3441ff8ba80ba (diff) | |
| parent | 411fd527bc3f8357b499c760f7cd03633a0c7de2 (diff) | |
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>
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions