projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07cf8f5 411fd52)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 7 Mar 2014 10:31:29 +0000 (11:31 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 7 Mar 2014 10:37:11 +0000 (11:37 +0100)
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>

Trivial merge