Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Mar 2013 14:54:29 +0000 (07:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Mar 2013 14:54:29 +0000 (07:54 -0700)
commit7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b
treea6f9970cebfb573a74a4abd06ff9caee41460e9a
parent0cb77508252e2d0e00c5ec7e57b4be9b3f7eb24d
parentcb16b91a449afd01b85ec4e59f30449d11c4acd7
Merge branch 'perf-urgent-for-linus' of git://git./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
arch/s390/include/asm/cpu_mf.h
kernel/trace/Kconfig