]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Jun 2006 17:59:39 +0000 (10:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Jun 2006 17:59:39 +0000 (10:59 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [PATCH] powerpc: Fix cell blade detection
  [PATCH] powerpc: Fix call to ibm,client-architecture-support
  powerpc: Fix machine check problem on 32-bit kernels


Trivial merge