Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 26 Nov 2014 19:42:41 +0000 (19:42 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 26 Nov 2014 19:42:41 +0000 (19:42 +0000)

Trivial merge