Ingo Molnar 32673822e4 Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core ...

Conflicts:
	include/linux/perf_event.h

Merge reason: pick up the latest jump-label enhancements, they are cooked ready.

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

2011-04-27 10:40:21 +02:00

..

appldata

[S390] appldata: fix dev_get_stats 64 bit conversion

2010-08-13 10:06:55 +02:00

boot

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2011-03-20 18:14:55 -07:00

crypto

crypto: sha-s390 - Reset index after processing partial block

2011-02-07 20:26:06 +11:00

hypfs

[S390] hypfs: Move buffer allocation from open to read

2011-01-05 12:47:27 +01:00

include/asm

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

2011-04-27 10:40:21 +02:00

kernel

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

2011-04-27 10:40:21 +02:00

kvm

Fix common misspellings

2011-03-31 11:26:23 -03:00

lib

futex: Sanitize futex ops argument types

2011-03-11 12:23:31 +01:00

math-emu

s390: change to new flag variable

2011-03-17 14:02:57 +01:00

mm

Fix common misspellings

2011-03-31 11:26:23 -03:00

oprofile

[S390] oprofile s390: prevent stack corruption

2011-04-04 09:43:32 +02:00

defconfig

[S390] Update default configuration

2011-01-12 09:55:24 +01:00

Kbuild

[S390] standardize Kbuild rules

2010-10-25 16:10:14 +02:00

Kconfig

jump label: Add s390 support

2011-04-04 13:43:16 -04:00

Kconfig.debug

[S390] Write protect module text and RO data

2011-03-15 17:08:23 +01:00

Makefile

[S390] remove redundant stack check option

2011-03-15 17:08:22 +01:00