From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 22 Jul 2007 07:10:35 +0000 (+0100)
Subject: Fix ppc64 mismerge
X-Git-Tag: v2.6.23-rc1~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa63fccc579ac609fc7f86d29ccb3a2edf910d7;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed