git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ec1e20a
70d4212
)
Merge branch 'devel-stable' into for-next
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 12 Nov 2013 10:58:59 +0000
(10:58 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 12 Nov 2013 10:58:59 +0000
(10:58 +0000)
Conflicts:
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/kernel/smp.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff