tree a3d342da1b1b4904351e7e0378df2ace3fb04759
parent d8af8582c321414087ed46512ffe5ce4f5c9c5da
parent 01aab518b084a547940ed6ff334e9a7721c7dc71
author Linus Torvalds <torvalds@linux-foundation.org> 1226168558 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226168558 -0800

Merge branch 'oprofile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'oprofile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  oprofile: Fix p6 counter overflow check
  Cell OProfile: Incorrect local array size in activate spu profiling function
  Revert "Cell OProfile: Incorrect local array size in activate spu profiling function"
  oprofile: fix memory ordering
  Cell OProfile: Incorrect local array size in activate spu profiling function
  Change UTF8 chars in Kconfig help text about Oprofile AMD barcelona