From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Sep 2008 22:54:32 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.27-rc6~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c1bad36054828b6a625afea39deb83d0e66e4336;p=linux-2.6-omap-h63xx.git

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

c1bad36054828b6a625afea39deb83d0e66e4336