git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Mon, 31 Mar 2014 08:40:13 +0000 (10:40 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Mon, 31 Mar 2014 08:45:15 +0000 (10:45 +0200)
commit	801aa71bb6ae4717aa838aaf36c9403bda439e01
tree	7b448b84cdc7ec0bbbd1ad6e9500eef94af0bfe8	tree \| snapshot
parent	07520963d382344b5f0c8f50a087c98cdfd772ab	commit \| diff
parent	7b9e7bfa1102114fdf61f36dd644d446412dac11	commit \| diff

Merge tag 'v3.14' into drm-intel-next-queued

Linux 3.14

The vt-d w/a merged late in 3.14-rc needs a bit of fine-tuning, hence
backmerge.

Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_dp.c

All trivial adjacent lines changed type conflicts, so trivial git
doesn't even show them in the merg commit.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/udl/udl_gem.c	diff1 \|	diff2 \|	blob \| history
fs/dcache.c	diff1 \|	diff2 \|	blob \| history