Merge branch 'x15-audio-fixes' into omap-for-v4.4/fixes
authorTony Lindgren <tony@atomide.com>
Thu, 12 Nov 2015 17:58:21 +0000 (09:58 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 12 Nov 2015 17:58:21 +0000 (09:58 -0800)

Trivial merge