tree 6e61d976d857186b88679c295b01b2d3d2cdd13d
parent d7fff6f4d1ed1bc31577df887fefcb1541923367
author Al Viro <viro@ftp.linux.org.uk> 1185088235 +0100
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1185126087 -0700

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>