commit 7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b
author Linus Torvalds <torvalds@linux-foundation.org> Mon Mar 11 07:54:29 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Mar 11 07:54:29 2013 -0700
tree a6f9970cebfb573a74a4abd06ff9caee41460e9a
parent 0cb77508252e2d0e00c5ec7e57b4be9b3f7eb24d
parent cb16b91a449afd01b85ec4e59f30449d11c4acd7

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