Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Dec 2007 18:37:46 +0000 (10:37 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Dec 2007 18:37:46 +0000 (10:37 -0800)
commit1842c7f260dd24dad2dd8eded80904d7a6c5525f
treeaff68702c9477c21b26284346ba98feebc91d849
parent29a09a7b138b1708de3d98a92fddcc18268084aa
parentec5d2dfe72cf4808ae4ecee03454a4d91dfcbe0c
Merge branch 'merge' of git://git./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