tree 406b70a86768535105b226c2b2f0a59b301cc52e
parent 627fa177a1502ad24390d945851209ac022f3a36
parent 388c3aab5d4f1b0bbfe2d5f47e7cd681866bc573
author Linus Torvalds <torvalds@linux-foundation.org> 1266857732 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266857732 -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 probe: Init struct probe_point and set counter correctly
  hw-breakpoint: Keep track of dr7 local enable bits
  hw-breakpoints: Accept breakpoints on NULL address
  perf_events: Fix FORK events