Ingo Molnar ec00010972 Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches ...

Conflicts:
	arch/x86/kernel/traps.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2014-06-06 07:55:06 +02:00

..

acpi

…

asm-generic

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches

2014-06-06 07:55:06 +02:00

clocksource

…

crypto

…

drm

…

dt-bindings

…

keys

…

kvm

…

linux

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches

2014-06-06 07:55:06 +02:00

math-emu

…

media

…

memory

…

misc

…

net

…

pcmcia

…

ras

…

rdma

…

rxrpc

…

scsi

…

sound

…

target

…

trace

…

uapi

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches

2014-06-06 07:55:06 +02:00

video

…

xen

…

Kbuild

…