| commit | 416dfdcdb894432547ead4fcb9fa6a36b396059e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Apr 24 10:11:18 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Apr 24 10:11:23 2009 +0200 |
| tree | 8033fdda07397a59c5fa98c88927040906ce6c1a | |
| parent | 56449f437add737a1e5e1cb7e00f63ac8ead1938 [diff] | |
| parent | 091069740304c979f957ceacec39c461d0192158 [diff] |
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Conflicts:
arch/x86/kernel/ptrace.c
Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency change from upstream so that we can remove it
here.
Signed-off-by: Ingo Molnar <mingo@elte.hu>