Merge branch 'topic/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 27 Jan 2015 23:50:47 +0000 (23:50 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 27 Jan 2015 23:52:44 +0000 (23:52 +0000)

Trivial merge