commit fa3533e778d9189d242929a795b438587df69110
author Arnd Bergmann <arnd@arndb.de> Thu Jul 14 15:11:40 2016 +0200
committer Arnd Bergmann <arnd@arndb.de> Thu Jul 14 15:11:40 2016 +0200
tree 104bf451c28598e6100bea23465aa6ab3a41cf98
parent 29d7a6ab10b454918643303991dbe8dc60b36ce3
parent afd9dc4562c5838323a3909cc717a8617307c253

Merge tag 'sti-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/defconfig

Merge "STi defconfig updates for v4.8" from Patrice Chotard:

- Enable DRM_STI for STMicroelectronics DRM Support
- VIDEO_STI_BDISP for STMicroelectronics BDISP 2D

* tag 'sti-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support
  ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver