tree 3a0b1a4abfa362dd6b6690662cc6588bddb21262
parent d94bc4fc24ed6263746934ace161ab916818d38a
parent d01343244abdedd18303d0323b518ed9cdcb1988
author Linus Torvalds <torvalds@linux-foundation.org> 1287013823 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287013823 -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:
  ring-buffer: Fix typo of time extends per page
  perf, MIPS: Support cross compiling of tools/perf for MIPS
  perf: Fix incorrect copy_from_user() usage