tree 7f76fb2b9c2d1966ed0bac068fead768eba3c56e
parent 0e976064256523ca604bd82048ae0e3402ce2467
parent 5bad7d29a7bcffb2dbc28ea2728eeb3af13784f2
author Linus Torvalds <torvalds@linux-foundation.org> 1447381487 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1447381487 -0800

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