tree b9f7014a6309f6b82e947d926384c0e2101b28cd
parent ea5634246beaedd91b93d7e7fce7d825232d1b78
parent f26542600e605482a1231c44ddb2966d69bd09b0
author Linus Torvalds <torvalds@linux-foundation.org> 1249425160 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249425160 -0700

Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf_counter: Set the CONFIG_PERF_COUNTERS default to y if CONFIG_PROFILING=y
  perf: Fix read buffer overflow
  perf top: Add mwait_idle_with_hints to skip_symbols[]
  perf tools: Fix faulty check
  perf report: Update for the new FORK/EXIT events
  perf_counter: Full task tracing
  perf_counter: Collapse inherit on read()
  tracing, perf_counter: Add help text to CONFIG_EVENT_PROFILE
  perf_counter tools: Fix link errors with older toolchains