Merge branch 'topic/dai' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 16 Jan 2015 16:59:04 +0000 (16:59 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 16 Jan 2015 16:59:04 +0000 (16:59 +0000)

Trivial merge