git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c89c3a6
c70fbb0
)
Merge branch 'devel-stable' into for-next
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 5 Aug 2014 09:27:25 +0000
(10:27 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 5 Aug 2014 09:27:25 +0000
(10:27 +0100)
Conflicts:
arch/arm/kernel/perf_event_cpu.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff