git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
56449f4
0910697
)
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
author
Ingo Molnar
<mingo@elte.hu>
Fri, 24 Apr 2009 08:11:18 +0000
(10:11 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 24 Apr 2009 08:11:23 +0000
(10:11 +0200)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff