Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
commitaa9d40de77f8ec734f48d0be0c7fe7732d505af4
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 16:00:04 +0000 (26 09:00 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 16:00:04 +0000 (26 09:00 -0700)
treec505e514944b73c604aaef15e01d39ada076fc98
parentd85f57938ad1d674dff8077a2e6a36a45dbe0e22
parent603c461250b223ac42c10b8d1df653af1a361d44
Merge branch 'merge' of git://git./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