android_kernel_xiaomi_sm7250/arch/powerpc
Al Viro 5fa63fccc5 Fix ppc64 mismerge
Fix a mismerge in commit 8b6f50ef1d:
"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>
2007-07-22 10:41:27 -07:00
..
boot PS3: Fix build with 32-bit toolchains 2007-07-21 17:49:16 -07:00
configs [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs 2007-07-20 21:42:24 +02:00
kernel [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs 2007-07-20 21:42:24 +02:00
lib [POWERPC] rheap - eliminates internal fragments caused by alignment 2007-06-19 22:35:53 -05:00
math-emu [POWERPC] ppc math-emu needs -fno-builtin-fabs for math.c and fabs.c 2006-09-26 15:24:35 +10:00
mm powerpc: tlb_32.c build fix 2007-07-21 17:49:16 -07:00
oprofile [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs 2007-07-20 21:42:24 +02:00
platforms Fix ppc64 mismerge 2007-07-22 10:41:27 -07:00
sysdev [CELL] driver for DDR2 memory on AXON 2007-07-20 21:41:42 +02:00
xmon [POWERPC] Make two xmon variables static 2007-07-10 21:55:46 +10:00
.gitignore [POWERPC] Add files build to .gitignore 2006-12-04 20:41:29 +11:00
Kconfig Start split out of common open firmware code 2007-07-20 13:28:41 +10:00
Kconfig.debug Fix trivial typos in Kconfig* files 2007-05-09 07:12:20 +02:00
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 2007-07-19 14:28:19 -07:00