git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3d00d4f
48936a0
)
Merge commit 'kumar/next' into next
author
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Mon, 31 May 2010 00:01:50 +0000
(10:01 +1000)
committer
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Mon, 31 May 2010 00:01:50 +0000
(10:01 +1000)
Conflicts:
arch/powerpc/sysdev/fsl_msi.c
Trivial merge