git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
78b79a7
4af4128
)
Merge branch 'omap-for-v3.20/defconfig' into for-next
author
Tony Lindgren
<tony@atomide.com>
Thu, 8 Jan 2015 01:03:41 +0000
(17:03 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 8 Jan 2015 01:03:41 +0000
(17:03 -0800)
Conflicts:
arch/arm/configs/omap2plus_defconfig
Trivial merge