Merge branch 'omap-for-v3.18/intc-v2' into omap-for-v3.18/tmp-merge
authorTony Lindgren <tony@atomide.com>
Thu, 18 Sep 2014 17:21:03 +0000 (10:21 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 18 Sep 2014 17:21:03 +0000 (10:21 -0700)

Trivial merge