git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
694f52d
e1902bb
)
Merge branch 'omap-for-v3.15/dt' into omap-for-v3.15/tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Wed, 12 Mar 2014 17:54:32 +0000
(10:54 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 12 Mar 2014 17:54:32 +0000
(10:54 -0700)
Conflicts:
arch/arm/mach-omap2/pdata-quirks.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff