Ingo Molnar 8302294f43 Merge branch 'tracing/core-v2' into tracing-for-linus ...

Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c

2009-04-02 00:49:02 +02:00

..

autoprobe.c

…

chip.c

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

2009-03-27 17:28:43 +01:00

devres.c

…

handle.c

Merge branch 'tracing/core-v2' into tracing-for-linus

2009-04-02 00:49:02 +02:00

internals.h

PM: Introduce functions for suspending and resuming device interrupts

2009-03-30 21:46:54 +02:00

Makefile

PM: Introduce functions for suspending and resuming device interrupts

2009-03-30 21:46:54 +02:00

manage.c

PM: Introduce functions for suspending and resuming device interrupts

2009-03-30 21:46:54 +02:00

migration.c

…

numa_migrate.c

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

2009-03-27 17:28:43 +01:00

pm.c

PM: Introduce functions for suspending and resuming device interrupts

2009-03-30 21:46:54 +02:00

proc.c

…

resend.c

…

spurious.c

…