tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

Browse Source 
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_modes.c
This commit is contained in:
Dave Airlie
2012-08-27 16:22:20 +10:00
parent 6f314ebbaa c182ae42cc
commit 93bb70e0c0
602 changed files with 6548 additions and 4724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/drm/drm_crtc.h
-2
View File
@@ -166,8 +166,6 @@ struct drm_display_mode {
int crtc_vsync_start;
int crtc_vsync_end;
int crtc_vtotal;
int crtc_hadjusted;
int crtc_vadjusted;
/* Driver private mode info */
int private_size;