mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
8a327f23e2
Merge with Linus to resolve conflicting fixes for the reusing the stale HEAD value during intel_ring_wait(). Conflicts: drivers/gpu/drm/i915/intel_ringbuffer.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
vga_switcheroo.c | ||
vgaarb.c |