commit a1c582d0720f2eff61043e90711767decf37b917
author Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Aug 30 09:58:46 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Aug 30 09:58:46 2007 -0700
tree 6ca3d2eab832c753ab36343ba9d19b6b0ef1f26f
parent b5f281a62761887e7cb5f60fa81f7cd052fec5cb
parent fc43dca9e75b87d24a16d5be7b497e83837d9d31

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:
  [POWERPC] PS3: Fix bug where the major version part is not compared
  [POWERPC] Update defconfigs
  [POWERPC] spufs: Don't call spu_run_init from spu_reacquire_runnable
  [POWERPC] spufs: Fix update of mailbox status register during backed wbox write
  [POWERPC] spu_manage: fix spu_unit_number for celleb device tree
  [POWERPC] Update defconfigs
  [POWERPC] Flush registers to proper task context