git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0034102
e65c54e
)
Merge branch 'cleanup-timer' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Mon, 9 Apr 2012 17:26:04 +0000
(10:26 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 9 Apr 2012 17:26:04 +0000
(10:26 -0700)
Conflicts:
arch/arm/mach-omap2/omap_hwmod.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff