tree 5030e903106465b36e769ea04d4dfe2b91b22949
parent 4762e252f4afc6909edb0babe9c25f126afedcaa
parent fe4c51b22080691792d3e28d86acb4d4ccb7e8e8
author Linus Torvalds <torvalds@linux-foundation.org> 1314037616 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1314037616 -0700

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/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