git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
84fbd2b
6ba54ab
)
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for...
author
Tony Lindgren
<tony@atomide.com>
Fri, 9 Nov 2012 22:54:17 +0000
(14:54 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 9 Nov 2012 22:54:17 +0000
(14:54 -0800)
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff