git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6bfc82f
3c7c5da
)
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux...
author
Tony Lindgren
<tony@atomide.com>
Fri, 21 Sep 2012 20:48:01 +0000
(13:48 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 21 Sep 2012 20:48:01 +0000
(13:48 -0700)
Conflicts:
arch/arm/mach-omap2/timer.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff