From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Nov 2015 17:12:38 +0000 (-0800)
Subject: Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=be4773e6a11a0cc1e63c9c32f000b870e51b8c01;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm sti driver updates from Dave Airlie:
 "The sti driver had a requirement on some patches in Greg's tree, they
  are in, so I see no problems just merging this one now"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
  drm/sti: load HQVDP firmware the first time HQVDP's plane is used
  drm/sti: fix typo issue in sti_mode_config_init
  drm/sti: set mixer background color through module param
  drm/sti: Remove local fbdev emulation Kconfig option
  drm/sti: remove redundant sign extensions
  drm/sti: hdmi use of_get_i2c_adapter_by_node interface
  drm/sti: hdmi fix i2c adapter device refcounting
  drm/sti: Do not export symbols
  drm/sti: Build monolithic driver
  drm/sti: Use drm_crtc_vblank_*() API
  drm/sti: Store correct CRTC index in events
  drm/sti: Select FW_LOADER
  drm/sti: Constify function pointer structs
---

be4773e6a11a0cc1e63c9c32f000b870e51b8c01