git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cfcfe22
c78f77e
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
author
David S. Miller
<davem@davemloft.net>
Wed, 6 Aug 2014 01:57:18 +0000
(18:57 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 6 Aug 2014 01:57:18 +0000
(18:57 -0700)
Conflicts:
arch/sparc/mm/init_64.c
Conflict was simple non-overlapping additions.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff