git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9727f0
dcf2191
)
Merge branch 'omap-for-v3.15/fixes-v2'
author
Tony Lindgren
<tony@atomide.com>
Fri, 25 Apr 2014 01:52:53 +0000
(18:52 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 25 Apr 2014 01:52:53 +0000
(18:52 -0700)
Conflicts:
arch/arm/boot/dts/omap3-beagle-xm-ab.dts
Trivial merge