tree 979edd96372170564f8b0f9b2e230dc0cde85794
parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560
parent 133dda1e4f757e036fa838cba6804d0344931c4a
author Linus Torvalds <torvalds@g5.osdl.org> 1149962379 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1149962379 -0700

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:
  [PATCH] powerpc: Fix cell blade detection
  [PATCH] powerpc: Fix call to ibm,client-architecture-support
  powerpc: Fix machine check problem on 32-bit kernels