aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-05 19:23:12 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-05 19:23:12 -0500
commitf3969bf78f140f437f51787dfc2751943ba454d1 (patch)
tree291ffc7e38d987e8b6fbcbc38dd055818dc34a05 /net/ipv4
parent98e990afa659769fe7ca1f2408fc7d2e946d5e50 (diff)
parentb7c924274c456499264d1cfa3d44063bb11eb5db (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "It contains three cherry-picked fixes from perf/core, which turned out to be more urgent than we originally thought." * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf tools: Handle kernels that don't support attr.exclude_{guest,host} perf tools: Change perf_guest default back to false perf record: No build id option fails
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions