Merge remote-tracking branches 'asoc/topic/bcm2835' and 'asoc/topic/cleanup' into...
authorMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:34 +0000 (13:54 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:34 +0000 (13:54 +0000)

Trivial merge