Merge branch 'fixes' into for-next
authorSebastian Reichel <sebastian.reichel@collabora.co.uk>
Fri, 1 Dec 2017 15:25:50 +0000 (16:25 +0100)
committerSebastian Reichel <sebastian.reichel@collabora.co.uk>
Fri, 1 Dec 2017 15:25:50 +0000 (16:25 +0100)
Merge fixes for 4.15-rc phase into next branch.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

Trivial merge