Merge branch 'psy-fixes' into psy-next
authorSebastian Reichel <sre@kernel.org>
Thu, 16 Aug 2018 20:19:22 +0000 (22:19 +0200)
committerSebastian Reichel <sre@kernel.org>
Thu, 16 Aug 2018 20:19:22 +0000 (22:19 +0200)
Signed-off-by: Sebastian Reichel <sre@kernel.org>

Trivial merge