Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/uda134x', 'asoc...
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:21 +0000 (13:12 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:21 +0000 (13:12 +0000)

Trivial merge