projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e56b3bc
f934fb1
)
Merge branch 'linus' into cpus4096
author
Ingo Molnar
<mingo@elte.hu>
Mon, 28 Jul 2008 21:32:00 +0000
(23:32 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 28 Jul 2008 21:32:00 +0000
(23:32 +0200)
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
1
2
kernel/cpu.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
kernel/cpu.c
Simple merge