Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] PS3: Fix printing of os-area magic numbers
  [POWERPC] Oprofile: Remove dependency on spufs module
This commit is contained in:
Linus Torvalds 2007-12-28 10:37:46 -08:00
commit 1842c7f260
9 changed files with 129 additions and 48 deletions