This resolves a merge issue and gets the vmbox drm driver into this
branch to be able to start taking fixes for it...
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>