diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-12 18:24:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-12 18:24:47 -0800 |
| commit | f6d07dfcb15aad199d7351d3122eabd506968daf (patch) | |
| tree | 7f76fb2b9c2d1966ed0bac068fead768eba3c56e /arch/parisc | |
| parent | 0e976064256523ca604bd82048ae0e3402ce2467 (diff) | |
| parent | 5bad7d29a7bcffb2dbc28ea2728eeb3af13784f2 (diff) | |
| download | linux-f6d07dfcb15aad199d7351d3122eabd506968daf.tar.bz2 | |
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
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions