git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e43bf76
a2601fc
)
Merge branch 'stable-3.2' into pandora-3.2
author
notaz
<notasas@gmail.com>
Sun, 13 Apr 2014 16:21:38 +0000
(19:21 +0300)
committer
notaz
<notasas@gmail.com>
Sun, 13 Apr 2014 16:21:38 +0000
(19:21 +0300)
Conflicts:
arch/arm/mm/proc-v7.S
Trivial merge