Merge branch 'peter/for-4.8_omapdss_part1' of https://github.com/omap-audio/linux...
authorTony Lindgren <tony@atomide.com>
Thu, 9 Jun 2016 07:44:00 +0000 (00:44 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 9 Jun 2016 07:44:00 +0000 (00:44 -0700)

Trivial merge