Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Aug 2011 18:26:56 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Aug 2011 18:26:56 +0000 (11:26 -0700)
commit8f6544edb2c7a7464fbbce1d86a4de414dc0cf95
tree5030e903106465b36e769ea04d4dfe2b91b22949
parent4762e252f4afc6909edb0babe9c25f126afedcaa
parentfe4c51b22080691792d3e28d86acb4d4ccb7e8e8
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Add group event scheduling option to perf record/stat
  MAINTAINERS: Fix list of perf events source files
  perf tools: Fix build against newer glibc
  perf tools: Fix error handling of unknown events
  perf evlist: Fix missing event name init for default event
  perf list: Fix exit value