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

..

alpha

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

arm

clockevents: fix resume logic

2007-07-21 17:49:15 -07:00

arm26

mm: Remove slab destructors from kmem_cache_create().

2007-07-20 10:11:58 +09:00

avr32

mm: fault feedback #2

2007-07-19 10:04:41 -07:00

blackfin

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

cris

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

2007-07-19 14:28:19 -07:00

frv

FRV: work around a possible compiler bug

2007-07-19 10:04:50 -07:00

h8300

PTRACE_POKEDATA consolidation

2007-07-17 10:23:03 -07:00

i386

x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata

2007-07-21 18:37:14 -07:00

ia64

revert "PIE randomization"

2007-07-21 17:49:14 -07:00

m32r

Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

2007-07-19 14:24:57 -07:00

m68k

m68k: exclude more unbuildable drivers

2007-07-20 08:24:49 -07:00

m68knommu

m68knommu: reformat show_cpuinfo()

2007-07-20 08:44:20 -07:00

mips

[MIPS] User stack pointer randomisation

2007-07-20 18:57:40 +01:00

parisc

define new percpu interface for shared data

2007-07-19 10:04:44 -07:00

powerpc

Fix ppc64 mismerge

2007-07-22 10:41:27 -07:00

ppc

Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

2007-07-19 14:24:57 -07:00

s390

s390: Put allocated ELF notes in read-only data segment

2007-07-19 10:04:47 -07:00

sh

clockevents: fix resume logic

2007-07-21 17:49:15 -07:00

sh64

sh64: Flag sh64_get_page() as __init_refok.

2007-07-20 17:46:42 +09:00

sparc

[SPARC32]: Make PAGE_SHARED a read-mostly variable.

2007-07-21 19:20:34 -07:00

sparc64

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

2007-07-21 20:38:51 -07:00

um

fallout from kbuild changes

2007-07-19 18:37:54 -07:00

v850

PTRACE_POKEDATA consolidation

2007-07-17 10:23:03 -07:00

x86_64

x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata

2007-07-21 18:37:14 -07:00

xtensa

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

2007-07-19 14:28:19 -07:00