Merge branch 'omap-for-v3.19/tmp-merge-2014-11-10'
authorTony Lindgren <tony@atomide.com>
Tue, 11 Nov 2014 00:51:35 +0000 (16:51 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 11 Nov 2014 00:51:35 +0000 (16:51 -0800)

Trivial merge