Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

Browse source

* '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()

...

This commit is contained in:

Linus Torvalds 2008-09-08 15:54:32 -07:00

parent 6a23312bd3 4ff23fa930

commit c1bad36054

2 changed files with 24 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/powerpc/boot/Makefile

View file

29

arch/powerpc/platforms/cell/spufs/sched.c

View file