diff options
author | 2014-05-30 17:56:09 -0700 | |
---|---|---|
committer | 2014-05-30 17:56:09 -0700 | |
commit | dbfc4b698ab83494eb8a03f5f3c478cec29a4f62 (patch) | |
tree | f04719877ba135dcc38335c0e9f2323f7c3d742a /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge tag 'linux-can-fixes-for-3.15-20140528' of git://gitorious.org/linux-can/linux-can (diff) | |
parent | ipvs: Fix panic due to non-linear skb (diff) | |
download | linux-dev-dbfc4b698ab83494eb8a03f5f3c478cec29a4f62.tar.xz linux-dev-dbfc4b698ab83494eb8a03f5f3c478cec29a4f62.zip |
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>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions