git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7185684
31d9adc
)
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
author
Jon Hunter
<jon-hunter@ti.com>
Mon, 1 Apr 2013 19:33:50 +0000
(14:33 -0500)
committer
Jon Hunter
<jon-hunter@ti.com>
Mon, 1 Apr 2013 19:33:50 +0000
(14:33 -0500)
Conflicts:
arch/arm/plat-omap/dmtimer.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff