commit | 844d6c48be7f11592d287a9fe2183007c4ebfbbb | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sat Aug 18 09:33:25 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sat Aug 18 09:33:25 2007 -0700 |
tree | c5df0cb0520a0537b49db5708af288c7991e5f82 | |
parent | 0894910cce8d9105e5d8457fd8686fe96dc958eb [diff] | |
parent | 2b02d13996fe28478e45605de9bd8bdca25718de [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] Fix invalid semicolon after if statement [POWERPC] ps3: Fix no storage devices found [POWERPC] Fix for assembler -g [POWERPC] Fix small race in 44x tlbie function [POWERPC] Remove unused code causing a compile warning [POWERPC] cell: Fix errno for modular spufs_create with invalid neighbour