Merge branch 'psy-reboot-mode-immutable' into psy-next
authorSebastian Reichel <sre@kernel.org>
Thu, 8 Jun 2017 16:21:25 +0000 (18:21 +0200)
committerSebastian Reichel <sre@kernel.org>
Thu, 8 Jun 2017 16:21:25 +0000 (18:21 +0200)

Trivial merge