tree c0ce7b9abcef8910ee78327285d85b04b0512d33
parent 341031caec0cd730e84d248d95851bf54ec4e41f
parent b27d515a49169e5e2a92d621faac761074a8c5b1
author Linus Torvalds <torvalds@linux-foundation.org> 1264092604 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1264092604 -0800

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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: x86: Add support for the ANY bit
  perf: Change the is_software_event() definition
  perf: Honour event state for aux stream data
  perf: Fix perf_event_do_pending() fallback callsite
  perf kmem: Print usage help for unknown commands
  perf kmem: Increase "Hit" column length
  hw-breakpoints, perf: Fix broken mmiotrace due to dr6 by reference change
  perf timechart: Use tid not pid for COMM change