diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-27 17:28:35 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-27 17:28:35 (GMT) |
commit | e2756f5e0fab825d08dcfbbe6b235166035fa501 (patch) | |
tree | 4087df8fd0dc16706d2db4e57adb5c4af2fb4a2a /drivers/mailbox | |
parent | 1c99ca43a499aecc41beb29a86a3807c8a6c159e (diff) | |
parent | e4f8eaad70ea186b8da290c99239dce721a34f88 (diff) | |
download | linux-fsl-qoriq-e2756f5e0fab825d08dcfbbe6b235166035fa501.tar.xz |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"The tree contains three fixes:
- Two tooling fixes
- Reversal of the new 'MMAP2' extended mmap record ABI, introduced in
this merge window. (Patches were proposed to fix it but it was all
a bit late and we felt it's safer to just delay the ABI one more
kernel release and do it right)"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Disable PERF_RECORD_MMAP2 support
perf scripting perl: Fix build error on Fedora 12
perf probe: Fix to initialize fname always before use it
Diffstat (limited to 'drivers/mailbox')
0 files changed, 0 insertions, 0 deletions