| commit | dbfc4b698ab83494eb8a03f5f3c478cec29a4f62 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri May 30 17:56:09 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri May 30 17:56:09 2014 -0700 |
| tree | f04719877ba135dcc38335c0e9f2323f7c3d742a | |
| parent | 554215c5ca08d196ed48a66693e7fc6e5f81f00e [diff] | |
| parent | f44a5f45f544561302e855e7bd104e5f506ec01b [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/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>