From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Nov 2015 02:24:47 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v4.4-rc1~22
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/f6d07dfcb15aad199d7351d3122eabd506968daf?hp=-c

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

Pull drm fixes from Dave Airlie:
 "One urgent fix for an oops under console lock in some drivers, one
  uapi fix, and one revert to fix rockchip regression"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  Revert "drm/rockchip: Convert the probe function to the generic drm_of_component_probe()"
  drm: Don't oops in drm_calc_timestamping_constants() if drm_vblank_init() wasn't called
  drm: Use userspace compatible type in fourcc_mod_code macro
---

f6d07dfcb15aad199d7351d3122eabd506968daf