Thomas Gleixner 3c56999eec Merge branch 'core/signal' into perfcounters/core ...

This is necessary to avoid the conflict of syscall numbers.

Conflicts:
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h

Fixes up the borked syscall numbers of perfcounters versus
preadv/pwritev as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2009-04-30 21:16:49 +02:00

..

alpha

alpha: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

arm

arm: Use __INIT macro instead of .text.init.

2009-04-27 19:51:58 -07:00

avr32

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

blackfin

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

cris

tty: Use the generic RS485 ioctl on CRIS

2009-04-07 08:44:05 -07:00

frv

FRV: Use __INIT macro instead of .text.init.

2009-04-27 19:46:30 -07:00

h8300

Get rid of final remnants of include/asm-$(ARCH)

2009-04-17 09:59:27 -07:00

ia64

KVM: ia64: fix locking order entering guest

2009-04-22 13:52:09 +03:00

m32r

m32r: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

m68k

m68k: arch/m68k/kernel/sun3-head.S needs <linux/init.h>

2009-04-28 16:07:18 -07:00

m68knommu

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

2009-04-24 08:45:53 -07:00

microblaze

microblaze: add parameter to microblaze_read()

2009-04-23 16:27:38 +02:00

mips

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

mn10300

mn10300: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

parisc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

2009-04-03 09:52:04 -07:00

powerpc

perf_counter: powerpc: allow use of limited-function counters

2009-04-29 14:58:35 +02:00

s390

s390: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:39 -07:00

sh

sh: Use __INIT macro instead of .text.init.

2009-04-27 19:51:58 -07:00

sparc

sparc: cleanup references to deprecated .text.init* sections.

2009-04-27 19:51:58 -07:00

um

uml: kill a kconfig warning

2009-04-21 13:41:50 -07:00

x86

Merge branch 'core/signal' into perfcounters/core

2009-04-30 21:16:49 +02:00

xtensa

xtensa: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

.gitignore

…

Kconfig

mutex: have non-spinning mutexes on s390 by default

2009-04-09 19:28:24 +02:00