diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-12 11:13:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-12 11:13:54 -0700 |
commit | 04da002d98852b38083beb9725967609945a8747 (patch) | |
tree | d5a755b46ecf39c7efe2a00d075ab27c5e030a70 /drivers/hwmon/max1668.c | |
parent | cec45d901ef4a8529b319436fdaf391955a39c7a (diff) | |
parent | e037239e5e7b61007763984aa35a8329596d8c88 (diff) |
Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux
Pull amd drm fixes from Alex Deucher:
"Dave is on vacation at the moment, so please pull these radeon and
amdgpu fixes directly.
Just a few minor things for 4.2:
- add a new radeon pci id
- fix a power management regression in amdgpu
- fix HEVC command buffer validation in amdgpu"
* 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: add new OLAND pci id
Revert "drm/amdgpu: Configure doorbell to maximum slots"
drm/amdgpu: add context buffer size check for HEVC
Diffstat (limited to 'drivers/hwmon/max1668.c')
0 files changed, 0 insertions, 0 deletions