Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 17 Mar 2015 12:16:27 +0000 (12:16 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 17 Mar 2015 12:16:27 +0000 (12:16 +0000)

Trivial merge