Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next (e19b9137) · Commits · github.com / kvm-riscv / linux

Commit e19b9137 authored Mar 18, 2014 by

Daniel Vetter

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>

parents 2fae6a86 e40d6410

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment