Merge tag 'omap-for-v3.13/soc-take2' into omap-for-v3.13/tmp-merge
authorTony Lindgren <tony@atomide.com>
Sat, 12 Oct 2013 00:30:45 +0000 (17:30 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 12 Oct 2013 00:30:45 +0000 (17:30 -0700)
SoC related changes for omaps to support the realtime
counter on newer omaps, and to fail early for omap5 es1.0
SoCs that don't have any support merged for them in the
mainline tree.


Trivial merge