xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'linus/master' into drm-intel-fixes

Browse Source 
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
This commit is contained in:
Chris Wilson
2011-01-23 17:22:16 +00:00
parent 5a9a8d1a99 d315777b32
commit 8a327f23e2
1096 changed files with 11968 additions and 8146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/vga/Kconfig
View File

@@ -1,5 +1,5 @@
config VGA_ARB
bool "VGA Arbitration" if EMBEDDED
bool "VGA Arbitration" if EXPERT
default y
depends on PCI
help