Commit cc0104e8 authored Dec 14, 2009 by Ingo Molnar

Merge branch 'linus' into tracing/urgent



Conflicts:
	kernel/trace/trace_kprobe.c

Merge reason: resolve the conflict.

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

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment