Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 22 Sep 2010 16:45:01 +0000 (18:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 22 Sep 2010 16:45:01 +0000 (18:45 +0200)
commit90edf27fb89241917e91155bfdcc7c8e5a587222
treea2d1841cfe382f426a3b6ccb306b0665ad455885
parent41945f6ccf1e86f87fddf6b32db9cf431c05fb54
parent8b15575cae7a93a784c3005c42b069edd9ba64dd
Merge branch 'linus' into perf/core

Conflicts:
kernel/hw_breakpoint.c

Merge reason: resolve the conflict.

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