4
parent 8b15575cae7a93a784c3005c42b069edd9ba64dd
author Ingo Molnar <mingo@elte.hu> 1285173901 +0200
committer Ingo Molnar <mingo@elte.hu> 1285173901 +0200

Merge branch 'linus' into perf/core

Conflicts:
	kernel/hw_breakpoint.c

Merge reason: resolve the conflict.

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