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

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

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 18 Mar 2014 08:43:56 +0000 (09:43 +0100)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 18 Mar 2014 08:43:56 +0000 (09:43 +0100)
commit	3ec9d3d50b67fd13b1c449780f0962b6fc0cc31c
tree	b36c83fa93da7f18c1331252fb82a87431697443	tree \| snapshot
parent	435959331f0bb996872bfeaf38911c24f55f3238	commit \| diff
parent	235ac0ecb99fcb7b78ce69b08358e66b3a5196bf	commit \| diff

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/Makefile

Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.

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

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/i915/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gpu_error.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ringbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ringbuffer.h	diff1 \|	diff2 \|	blob \| history