projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit52af2bfcc0f1de4d2bf7a292127f9731f08c2c8e
tree99763602d04b5ac7b54a12631b58314694118d1etree | snapshot (tar.gz zip)
parent07cf8f5ae2657ac495b906c68ff3441ff8ba80bacommit | diff
parent411fd527bc3f8357b499c760f7cd03633a0c7de2commit | diff
Merge git://git./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>