diff options
| author | Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2018-10-16 13:32:46 +0300 |
|---|---|---|
| committer | Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2018-10-16 13:32:46 +0300 |
| commit | 1ebdbbd95cf3e69d1e1fc05d5f6f2f5ae9c79346 (patch) | |
| tree | 61470614425b39350ba83a23f4c5919bb20dd903 /include/sound/memalloc.h | |
| parent | 48e4d34232db3345ea334ec09cf7dd3f258686e7 (diff) | |
| parent | 81067b71c1d944ea1f93ee67ef0be16d8b4957b4 (diff) | |
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip
# Conflicts:
# drivers/gpu/drm/i915/i915_irq.c
# drivers/gpu/drm/i915/intel_display.c
# drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'include/sound/memalloc.h')
0 files changed, 0 insertions, 0 deletions