git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef5fa1b a5a9711)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 2 Jan 2008 05:30:42 +0000 (21:30 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 2 Jan 2008 05:30:42 +0000 (21:30 -0800)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix build failure on Cell when CONFIG_SPU_FS=y


Trivial merge
Pandora Kernel Repository