summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/fsl_lpuart.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-14 18:10:35 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-14 18:11:30 +0200
commit622147fdad5425f6f572f84ce709303e5e0500b7 (patch)
tree9b5adde02ed4481db2dc5011a2c9447c8cac12eb /drivers/tty/serial/fsl_lpuart.c
parentdrm/i915/skl: WaIgnoreDDIAStrap is forever, always init DDI A (diff)
parentdrm/i915: Commit planes on each crtc separately. (diff)
downloadlinux-622147fdad5425f6f572f84ce709303e5e0500b7.tar.xz
linux-622147fdad5425f6f572f84ce709303e5e0500b7.zip
Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes
Backmerge drm-intel-fixes because a bunch of atomic patch backporting we had to do lead to horrible conflicts. Conflicts: drivers/gpu/drm/drm_crtc.c Just a bit of context conflict between -next and -fixes. drivers/gpu/drm/i915/intel_atomic.c drivers/gpu/drm/i915/intel_display.c Atomic conflicts, always pick the code from -next. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/tty/serial/fsl_lpuart.c')
0 files changed, 0 insertions, 0 deletions