git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43d2548
fafa3a3
)
Merge commit 'origin/master'
author
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Wed, 16 Jul 2008 01:07:59 +0000
(11:07 +1000)
committer
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Wed, 16 Jul 2008 01:07:59 +0000
(11:07 +1000)
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Trivial merge