git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9982fbf
63cf13b
)
Merge branch 'linus' into cpus4096
author
Ingo Molnar
<mingo@elte.hu>
Tue, 15 Jul 2008 22:29:07 +0000
(
00:29
+0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 15 Jul 2008 22:29:07 +0000
(
00:29
+0200)
Conflicts:
arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff