From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 28 Dec 2007 18:37:46 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.24-rc7~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1842c7f260dd24dad2dd8eded80904d7a6c5525f;p=thirdparty%2Fkernel%2Flinux.git

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

1842c7f260dd24dad2dd8eded80904d7a6c5525f