git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9fafbd8
317f394
)
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
author
David S. Miller
<davem@davemloft.net>
Fri, 20 May 2011 20:10:22 +0000
(13:10 -0700)
committer
David S. Miller
<davem@davemloft.net>
Fri, 20 May 2011 20:10:22 +0000
(13:10 -0700)
Conflicts:
arch/sparc/kernel/smp_32.c
With merge conflict help from Daniel Hellstrom.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff