Merge branch 'omap-for-v3.13/tmp-merge-take2'
authorTony Lindgren <tony@atomide.com>
Tue, 29 Oct 2013 23:08:45 +0000 (16:08 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 29 Oct 2013 23:08:45 +0000 (16:08 -0700)

Trivial merge