git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
573f8c8
b28748f
)
Merge branch 'misc' into for-linus
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Wed, 20 Feb 2013 14:35:58 +0000
(14:35 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Wed, 20 Feb 2013 14:35:58 +0000
(14:35 +0000)
Conflicts:
arch/arm/include/asm/memory.h
Trivial merge