]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 86df9fb e539fdd)
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)
commit1d0ed80568e752d12e0b10d002478b8872124b35
tree99763602d04b5ac7b54a12631b58314694118d1etree | snapshot
parent86df9fb9366adc72d83cfe062a3c00fcf6872d46commit | diff
parente539fdd286d0c293cc912e0c2277322f02c51c92commit | 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>
Linux Kernel Source Tree.