commit | c1bad36054828b6a625afea39deb83d0e66e4336 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 08 15:54:32 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 08 15:54:32 2008 -0700 |
tree | 03bf959db6a53e04dcc8cee7217e8ea38c7545b3 | |
parent | 6a23312bd31878db555afad98b44705fc1590896 [diff] | |
parent | 4ff23fa93011e2367fea056e72c92709178972d9 [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()