Merge branch 'topic/err' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 6 Mar 2015 20:33:19 +0000 (20:33 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 6 Mar 2015 20:33:19 +0000 (20:33 +0000)

Trivial merge