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