Ingo Molnar f0ef039851 Merge branch 'x86/core' into tracing/textedit ...

Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

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

2009-03-06 16:45:01 +01:00

..

acpi

…

asm-arm

…

asm-frv

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +01:00

asm-generic

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +01:00

asm-h8300

…

asm-m32r

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +01:00

asm-mn10300

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +01:00

crypto

…

drm

drm: disable encoders before re-routing them

2009-02-25 14:42:23 +10:00

keys

…

linux

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +01:00

math-emu

…

media

…

mtd

…

net

netfilter: nf_conntrack: don't try to deliver events for untracked connections

2009-02-18 15:30:34 +01:00

pcmcia

…

rdma

…

rxrpc

…

scsi

…

sound

…

trace

tracing: add lockdep tracepoints for lock acquire/release

2009-03-04 18:49:58 +01:00

video

…

xen

…

Kbuild

…