Merge branch 'perf/core' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 4 Mar 2010 10:47:50 +0000 (11:47 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 4 Mar 2010 10:47:52 +0000 (11:47 +0100)
commit4f16d4e0c9a4b20d9f0db365587b96d6001efd7d
treefa25dcf285b26f1fac2bf267d0d1cd2c4eba90b8
parent1e259e0a9982078896f3404240096cbea01daca4
parent6630125419ef37ff8781713c5e9d416f2a4ba357
Merge branch 'perf/core' into perf/urgent

Merge reason: Switch from pre-merge topical split to the post-merge urgent track

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/hw_breakpoint.c
kernel/hw_breakpoint.c