leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5fa63fccc5
linux/arch/powerpc/platforms/cell
History
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
..
spufs Fix ppc64 mismerge 2007-07-22 10:41:27 -07:00
axon_msi.c [CELL] add support for MSI on Axon-based Cell systems 2007-07-20 21:41:45 +02:00
cbe_cpufreq_pervasive.c [CELL] cbe_cpufreq: reorganize code 2007-07-20 21:41:38 +02:00
cbe_cpufreq_pmi.c [CELL] cbe_cpufreq: reorganize code 2007-07-20 21:41:38 +02:00
cbe_cpufreq.c [CELL] fix cbe_cpufreq for legacy SLOF tree. 2007-07-20 21:41:39 +02:00
cbe_cpufreq.h [CELL] cbe_cpufreq: reorganize code 2007-07-20 21:41:38 +02:00
cbe_regs.c [CELL] allow linux to map Cell regs on legacy SLOF tree. 2007-07-20 21:41:41 +02:00
cbe_regs.h [POWERPC] cell: add cbe_node_to_cpu function 2007-04-23 21:44:38 +02:00
cbe_thermal.c [CELL] fix cbe_thermal for legacy SLOF tree. 2007-07-20 21:41:40 +02:00
interrupt.c [POWERPC] Rename device_is_compatible to of_device_is_compatible 2007-05-07 20:31:14 +10:00
interrupt.h [POWERPC] cell: Add routines for managing PMU interrupts 2006-12-04 20:40:12 +11:00
io-workarounds.c [POWERPC] Rewrite IO allocation & mapping on powerpc64 2007-06-14 22:29:56 +10:00
iommu.c [POWERPC] Rename get_property to of_get_property: arch/powerpc 2007-04-13 03:55:19 +10:00
Kconfig [CELL] cbe_cpufreq: reorganize code 2007-07-20 21:41:38 +02:00
Makefile [CELL] add support for MSI on Axon-based Cell systems 2007-07-20 21:41:45 +02:00
pervasive.c powerpc: fixup hard_irq_disable semantics 2007-05-11 08:29:34 -07:00
pervasive.h [POWERPC] cell: add RAS support 2006-06-21 15:01:29 +10:00
pmu.c [POWERPC] cell: PPU Oprofile cleanup patch 2007-02-13 22:03:06 +01:00
ras.c [POWERPC] get_property cleanups 2007-04-30 11:02:05 +10:00
ras.h [POWERPC] cell: add RAS support 2006-06-21 15:01:29 +10:00
setup.c [POWERPC] Rename device_is_compatible to of_device_is_compatible 2007-05-07 20:31:14 +10:00
smp.c [POWERPC] Cleanup CPU inits 2006-08-25 13:27:35 +10:00
spider-pic.c [POWERPC] Rename device_is_compatible to of_device_is_compatible 2007-05-07 20:31:14 +10:00
spu_base.c [CELL] spufs: rework list management and associated locking 2007-07-20 21:42:28 +02:00
spu_callbacks.c [POWERPC] Unify ppc syscall tables 2006-06-21 15:01:32 +10:00
spu_coredump.c [POWERPC] spufs: enable SPU coredump for kernel-builtin spufs 2007-04-23 21:18:59 +02:00
spu_manage.c Cell: Draw SPE helper penguin logos 2007-07-17 10:23:13 -07:00
spu_priv1_mmio.c [POWERPC] Celleb: consolidate spu management ops 2007-02-07 14:03:21 +11:00
spu_priv1_mmio.h [POWERPC] cell: abstract spu management routines 2006-12-04 20:40:39 +11:00
spu_syscalls.c [CELL] spufs: extension of spu_create to support affinity definition 2007-07-20 21:42:15 +02:00