diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2017-03-27 17:32:47 -0300 |
|---|---|---|
| committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2017-03-27 17:32:47 -0300 |
| commit | e5f8830cc15d0834ecee7b193b2fde9633eaab55 (patch) | |
| tree | ef0edf8ebd947ceb345cc61a570006dbaf284d09 /drivers/hid/wacom_sys.c | |
| parent | 0abfe7e2570d7c729a7662e82c09a23f00f29346 (diff) | |
| parent | 44a126ba5d13db90945115324851466685b03733 (diff) | |
Merge remote-tracking branch 'intel/drm-intel-next-queued' into drm-tip
# Conflicts:
# drivers/gpu/drm/i915/gvt/cmd_parser.c
# drivers/gpu/drm/i915/gvt/scheduler.c
# drivers/gpu/drm/i915/i915_drv.c
# drivers/gpu/drm/i915/i915_gem.c
# drivers/gpu/drm/i915/i915_gem_context.c
# drivers/gpu/drm/i915/i915_gem_shrinker.c
# drivers/gpu/drm/i915/i915_irq.c
# drivers/gpu/drm/i915/intel_csr.c
# drivers/gpu/drm/i915/intel_pm.c
Diffstat (limited to 'drivers/hid/wacom_sys.c')
0 files changed, 0 insertions, 0 deletions