summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-06 01:23:12 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-06 01:23:12 +0100
commitf3969bf78f140f437f51787dfc2751943ba454d1 (patch)
tree291ffc7e38d987e8b6fbcbc38dd055818dc34a05 /scripts
parentMerge tag 'usb-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff)
parentMerge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-f3969bf78f140f437f51787dfc2751943ba454d1.tar.xz
linux-f3969bf78f140f437f51787dfc2751943ba454d1.zip
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 'scripts')
0 files changed, 0 insertions, 0 deletions