]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a23312 4ff23fa)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:54:32 +0000 (15:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:54:32 +0000 (15:54 -0700)
commitc1bad36054828b6a625afea39deb83d0e66e4336
tree03bf959db6a53e04dcc8cee7217e8ea38c7545b3tree | snapshot
parent6a23312bd31878db555afad98b44705fc1590896commit | diff
parent4ff23fa93011e2367fea056e72c92709178972d9commit | diff
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: Fix rare boot build breakage
  powerpc/spufs: Fix possible scheduling of a context to multiple SPEs
  powerpc/spufs: Fix race for a free SPU
  powerpc/spufs: Fix multiple get_spu_context()
Linux 2.6 source tree