mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-18 00:24:58 +08: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 |