From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Nov 2008 18:22:38 +0000 (-0800)
Subject: Merge branch 'oprofile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.28-rc4~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af3e48ffce029a191f1bc4b8550e8571303233d5;p=linux-2.6-omap-h63xx.git

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
---

af3e48ffce029a191f1bc4b8550e8571303233d5