Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <[email protected]>
Wed, 26 Sep 2007 16:00:04 +0000 (09:00 -0700)
committerLinus Torvalds <[email protected]>
Wed, 26 Sep 2007 16:00:04 +0000 (09:00 -0700)
* '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


Trivial merge