Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Sat, 6 Sep 2014 12:38:26 +0000 (13:38 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 6 Sep 2014 12:38:26 +0000 (13:38 +0100)

Trivial merge