git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29a09a7 ec5d2df)
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)
* '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


Trivial merge
Pandora Kernel Repository