Merge 4.13-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jul 2017 02:53:30 +0000 (19:53 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jul 2017 02:53:30 +0000 (19:53 -0700)
commita29e24907208a7e05e9bd3f990d3fc5ea49667de
tree9ccf691398e230764dd09ed83211376a0e77e4a9
parent6f6752648a868135222cb77286bca02fc8730268
parent520eccdfe187591a51ea9ab4c1a024ae4d0f68d9
Merge 4.13-rc2 into staging-next

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/Kconfig
drivers/staging/Makefile