| commit | aa9d40de77f8ec734f48d0be0c7fe7732d505af4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Sep 26 09:00:04 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Sep 26 09:00:04 2007 -0700 |
| tree | c505e514944b73c604aaef15e01d39ada076fc98 | |
| parent | d85f57938ad1d674dff8077a2e6a36a45dbe0e22 [diff] | |
| parent | 603c461250b223ac42c10b8d1df653af1a361d44 [diff] |
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