From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 26 Sep 2007 16:00:04 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.23-rc9~40
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa9d40de77f8ec734f48d0be0c7fe7732d505af4;p=linux-2.6

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] spufs: fix mismerge, making context signal{1,2} files readable again
---

aa9d40de77f8ec734f48d0be0c7fe7732d505af4