git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
97d9a3d
0f3ccb2
)
Merge branch 'dm814x-soc' into omap-for-v4.3/soc
omap-for-v4.3/soc-signed
author
Tony Lindgren
<tony@atomide.com>
Fri, 24 Jul 2015 04:59:18 +0000
(21:59 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 24 Jul 2015 04:59:18 +0000
(21:59 -0700)
Update dm814x changes for sparse fixes to make data structures
static.
Conflicts:
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
1
2
arch/arm/mach-omap2/board-generic.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/io.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/prcm-common.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/board-generic.c
Simple merge
diff --cc
arch/arm/mach-omap2/io.c
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod.c
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod.h
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/prcm-common.h
Simple merge