Ingo Molnar d0303d71c2 Merge branch 'linus' into perf/core ...

Conflicts:
	arch/sparc/kernel/perf_event.c

Merge reason: Resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2010-09-23 08:02:09 +02:00

..

alpha

Merge commit 'v2.6.36-rc5' into perf/core

2010-09-21 13:55:11 +02:00

arm

Merge commit 'v2.6.36-rc5' into perf/core

2010-09-21 13:55:11 +02:00

avr32

Make do_execve() take a const filename pointer

2010-08-17 18:07:43 -07:00

blackfin

Blackfin: bf52x/bf54x boards: drop unused nand page size

2010-08-27 16:08:43 -04:00

cris

Make do_execve() take a const filename pointer

2010-08-17 18:07:43 -07:00

frv

frv: double syscall restarts, syscall restart in sigreturn()

2010-09-20 10:44:38 -07:00

h8300

h8300: Fix missing consts in kernel_execve()

2010-09-07 13:52:28 -07:00

ia64

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

2010-09-16 12:58:44 -07:00

m32r

Make do_execve() take a const filename pointer

2010-08-17 18:07:43 -07:00

m68k

m68k,m68knommu: Wire up fanotify_init, fanotify_mark, and prlimit64

2010-09-13 20:28:45 +02:00

m68knommu

m68k,m68knommu: Wire up fanotify_init, fanotify_mark, and prlimit64

2010-09-13 20:28:45 +02:00

microblaze

Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6

2010-08-18 09:26:17 -07:00

mips

compat: Make compat_alloc_user_space() incorporate the access_ok()

2010-09-14 16:08:45 -07:00

mn10300

MN10300: Fix up the IRQ names for the on-chip serial ports

2010-09-14 17:06:28 -07:00

parisc

compat: Make compat_alloc_user_space() incorporate the access_ok()

2010-09-14 16:08:45 -07:00

powerpc

Merge branch 'linus' into perf/core

2010-09-23 08:02:09 +02:00

s390

compat: Make compat_alloc_user_space() incorporate the access_ok()

2010-09-14 16:08:45 -07:00

score

Make do_execve() take a const filename pointer

2010-08-17 18:07:43 -07:00

sh

perf, sh: Fix patch merge foul-up

2010-09-15 10:43:59 +02:00

sparc

Merge branch 'linus' into perf/core

2010-09-23 08:02:09 +02:00

tile

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

2010-09-16 12:54:54 -07:00

um

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

2010-08-28 13:55:31 -07:00

x86

Merge branch 'linus' into perf/core

2010-09-22 18:45:01 +02:00

xtensa

Make do_execve() take a const filename pointer

2010-08-17 18:07:43 -07:00

.gitignore

…

Kconfig

kprobes: Fix Kconfig dependency

2010-09-13 20:41:31 +02:00