Merge branch 'omap-for-v3.11/omap5' into omap-for-v3.11/tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 12 Jun 2013 17:40:10 +0000 (10:40 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Jun 2013 17:40:10 +0000 (10:40 -0700)

Trivial merge