cf408a
Merge branch 'users/osalvador/SLE12-SP5/for-next' into SLE12-SP5 Pull a drm fix from Oscar Salvador