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)
commit68204f2fbae26dd3ca2b4c7f52ce9d006e8dc08f
tree271cca9b24f66ea771e8ffe7383289921a8da4ea
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323
parentaac799040731ee338b84d27c27fa2d903e89c857
Merge branch 'fixes' into for-next

Merge fixes for 4.15-rc phase into next branch.

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