tree 53edfe621b34f30b6f5212f4479d21e2c68dc743
parent 763008c4357b73c8d18396dfd8d79dc58fa3f99d
parent 737480a0d525dae13306296da08029dff545bc72
author Linus Torvalds <torvalds@linux-foundation.org> 1282234009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282234009 -0700

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:
  kprobes/x86: Fix the return address of multiple kretprobes
  perf tools: Fix build error on read only source.
  perf, x86: Fix Intel-nhm PMU programming errata workaround