diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 15:54:29 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 15:54:29 +0100 |
commit | 7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b (patch) | |
tree | a6f9970cebfb573a74a4abd06ff9caee41460e9a /arch/cris/kernel | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
parent | s390: Fix a header dependencies related build error (diff) | |
download | linux-7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b.tar.xz linux-7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b.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:
"Misc minor fixes mostly related to tracing"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
s390: Fix a header dependencies related build error
tracing: update documentation of snapshot utility
tracing: Do not return EINVAL in snapshot when not allocated
tracing: Add help of snapshot feature when snapshot is empty
ftrace: Update the kconfig for DYNAMIC_FTRACE
Diffstat (limited to 'arch/cris/kernel')
0 files changed, 0 insertions, 0 deletions