diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-22 10:24:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-22 10:24:55 +1000 |
| commit | c50f13f911b90a722308bffbf26187ff3890aa1e (patch) | |
| tree | 0a0f6a316a123be939664c19985b07c14bc5885b /mm/memory.c | |
| parent | c2a75586ff27ee7636bb2bf33ee66992a6603e49 (diff) | |
| parent | 677c884ff6370add1360e2b9558285355ebe2b36 (diff) | |
Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Just a crash fix for radeon and amdgpu if the user has forcibly disabled
dpm and tries to access the pwm sysfs controls.
* 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: add missing dpm check for KV dpm late init
drm/amdgpu/dpm: don't add pwm attributes if DPM is disabled
drm/radeon/dpm: don't add pwm attributes if DPM is disabled
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions