commit 8b061610dac3a3b89770c85ad63b481a47b0c38e
author Linus Torvalds <torvalds@linux-foundation.org> Sat May 07 13:17:37 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat May 07 13:17:37 2011 -0700
tree 3ab93ad7f8f3e8bd612cff4e59d55d5a36c0c1fa
parent c2bf807eb347325988b1c7f9139e934ed9b1d795
parent 174a7b1f9692acad7f0ca2b02f696894201a6d94

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 tools: Makefile: Use gcc to determine ARCH
  perf events, x86: Fix Intel Nehalem and Westmere last level cache event definitions
  hw_breakpoints, powerpc: Fix CONFIG_HAVE_HW_BREAKPOINT off-case in ptrace_set_debugreg()
  sh, hw_breakpoints: Fix racy access to ptrace breakpoints
  arm, hw_breakpoints: Fix racy access to ptrace breakpoints
  powerpc, hw_breakpoints: Fix racy access to ptrace breakpoints
  x86, hw_breakpoints: Fix racy access to ptrace breakpoints
  ptrace: Prepare to fix racy accesses on task breakpoints