projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 554215c f44a5f4)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Sat, 31 May 2014 00:56:09 +0000 (17:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 31 May 2014 00:56:09 +0000 (17:56 -0700)
commitdbfc4b698ab83494eb8a03f5f3c478cec29a4f62
treef04719877ba135dcc38335c0e9f2323f7c3d742atree | snapshot (tar.gz zip)
parent554215c5ca08d196ed48a66693e7fc6e5f81f00ecommit | diff
parentf44a5f45f544561302e855e7bd104e5f506ec01bcommit | diff
Merge branch 'master' of git://git./linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
The following patchset contains a late fix for IPVS:

* Fix crash when trying to remove the transport header with non-linear
  skbuffs, this was introduced in 3.6-rc. Patch from Peter Christensen
  via the IPVS folks.

I'll pass this to -stable once this hits mainstream.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>