| commit | 90edf27fb89241917e91155bfdcc7c8e5a587222 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Sep 22 18:45:01 2010 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Sep 22 18:45:01 2010 +0200 |
| tree | a2d1841cfe382f426a3b6ccb306b0665ad455885 | |
| parent | 41945f6ccf1e86f87fddf6b32db9cf431c05fb54 [diff] | |
| parent | 8b15575cae7a93a784c3005c42b069edd9ba64dd [diff] |
Merge branch 'linus' into perf/core Conflicts: kernel/hw_breakpoint.c Merge reason: resolve the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>