Merge branch 'fix/atmel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 27 Jan 2015 17:35:41 +0000 (17:35 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 27 Jan 2015 17:35:41 +0000 (17:35 +0000)

Trivial merge