aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-22 03:10:35 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 13:41:27 -0400
commit5fa63fccc579ac609fc7f86d29ccb3a2edf910d7 (patch)
tree6e61d976d857186b88679c295b01b2d3d2cdd13d /kernel/sysctl.c
parentd7fff6f4d1ed1bc31577df887fefcb1541923367 (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>
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions