| commit | 1842c7f260dd24dad2dd8eded80904d7a6c5525f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Dec 28 10:37:46 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Dec 28 10:37:46 2007 -0800 |
| tree | aff68702c9477c21b26284346ba98feebc91d849 | |
| parent | 29a09a7b138b1708de3d98a92fddcc18268084aa [diff] | |
| parent | ec5d2dfe72cf4808ae4ecee03454a4d91dfcbe0c [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] PS3: Fix printing of os-area magic numbers [POWERPC] Oprofile: Remove dependency on spufs module