tree 7eecd1c529e60c220a4376a51f47f83d77a89da2
parent 82cd19cd93727d494c530ddd6a7338033c3fd86e
parent e1e359273576ee8fe27021356b064c772ed29af3
author Linus Torvalds <torvalds@linux-foundation.org> 1293580464 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1293580464 -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:
  ring_buffer: Off-by-one and duplicate events in ring_buffer_read_page