tree 341d152dc1f9427d70d5b1fadafca61d22baacbb
parent 02a99ed6207e9a1d787bb360ef97de023c7edf4a
parent 018df72dd01576ab199c6129233cdeaf1409958b
author Linus Torvalds <torvalds@linux-foundation.org> 1244837812 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244837812 -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: Start documenting HAVE_PERF_COUNTERS requirements
  perf_counter: Add forward/backward attribute ABI compatibility
  perf record: Explicity program a default counter
  perf_counter: Remove PERF_TYPE_RAW special casing
  perf_counter: PERF_TYPE_HW_CACHE is a hardware counter too
  powerpc, perf_counter: Fix performance counter event types
  perf_counter/x86: Add a quirk for Atom processors
  perf_counter tools: Remove one L1-data alias