Merge branch 'omap-for-v4.13/legacy-v2' into omap-for-v4.13/soc-v3
authorTony Lindgren <tony@atomide.com>
Mon, 12 Jun 2017 07:07:44 +0000 (00:07 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 12 Jun 2017 07:07:44 +0000 (00:07 -0700)
1  2 
arch/arm/mach-omap2/timer.c

Simple merge