Merge branch 'topic/ics43432' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
authorMark Brown <broonie@kernel.org>
Thu, 27 Aug 2015 19:30:46 +0000 (20:30 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 27 Aug 2015 19:30:46 +0000 (20:30 +0100)

Trivial merge