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)
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>
1  2 
drivers/staging/Kconfig
drivers/staging/Makefile

@@@ -110,6 -110,6 +110,8 @@@ source "drivers/staging/ccree/Kconfig
  
  source "drivers/staging/typec/Kconfig"
  
+ source "drivers/staging/vboxvideo/Kconfig"
 +source "drivers/staging/pi433/Kconfig"
 +
  endif # STAGING
@@@ -44,4 -44,4 +44,5 @@@ obj-$(CONFIG_KS7010)          += ks7010
  obj-$(CONFIG_GREYBUS)         += greybus/
  obj-$(CONFIG_BCM2835_VCHIQ)   += vc04_services/
  obj-$(CONFIG_CRYPTO_DEV_CCREE)        += ccree/
+ obj-$(CONFIG_DRM_VBOXVIDEO)   += vboxvideo/
 +obj-$(CONFIG_PI433)           += pi433/