projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5f281a fc43dca)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 30 Aug 2007 16:58:46 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 30 Aug 2007 16:58:46 +0000 (09:58 -0700)
* '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


Trivial merge
John Crispins staging tree