git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1056124
7185684
)
Merge commit '7185684' into omap-for-v3.10/timer
author
Tony Lindgren
<tony@atomide.com>
Wed, 3 Apr 2013 17:32:47 +0000
(10:32 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 3 Apr 2013 17:32:47 +0000
(10:32 -0700)
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff