projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d7fff6f) | patch
Fix ppc64 mismerge
authorAl Viro <viro@ftp.linux.org.uk>
Sun, 22 Jul 2007 07:10:35 +0000 (08:10 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 17:41:27 +0000 (10:41 -0700)
commit5fa63fccc579ac609fc7f86d29ccb3a2edf910d7
tree6e61d976d857186b88679c295b01b2d3d2cdd13dtree | snapshot (tar.gz zip)
parentd7fff6f4d1ed1bc31577df887fefcb1541923367commit | diff
Fix ppc64 mismerge

Fix a mismerge in commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10:
"spufs: make signal-notification files readonly for NOSCHED contexts",
where structs got duplicated.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/powerpc/platforms/cell/spufs/file.c diff | blob | blame | history