Skip to content
Commit 59c82310 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

Conflicts:
	drivers/gpu/drm/i915/intel_pm.c
parents de5126cc 0fb0b822
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment