]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'oprofile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Nov 2008 18:22:38 +0000 (10:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Nov 2008 18:22:38 +0000 (10:22 -0800)
* '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


Trivial merge