git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cbd379b
809e660
)
Merge branch 'devel-stable' into for-next
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Sat, 29 Jun 2013 10:44:43 +0000
(11:44 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sat, 29 Jun 2013 10:44:43 +0000
(11:44 +0100)
Conflicts:
arch/arm/Makefile
arch/arm/include/asm/glue-proc.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff