diff options
author | Dave Airlie <airlied@redhat.com> | 2016-03-25 09:02:06 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-03-25 09:02:06 +0300 |
commit | 4604202ca8d2a5e33b4bca0812b5d92975ed1bd8 (patch) | |
tree | 520ea356b99bf0e8b314bafd1f09d0967fb3cd0a /Documentation/watchdog/watchdog-parameters.txt | |
parent | 17efca93c8728445522dedafc033b3384a26a39d (diff) | |
parent | 1135035d9275ef9aecad23fc715a69ff78904adf (diff) | |
download | linux-4604202ca8d2a5e33b4bca0812b5d92975ed1bd8.tar.xz |
Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next
some amd fixes
* 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon/mst: cleanup code indentation
drm/radeon/mst: fix regression in lane/link handling.
drm/amdgpu: add invalidate_page callback for userptrs
drm/amdgpu: Revert "remove the userptr rmn->lock"
drm/amdgpu: clean up path handling for powerplay
drm/amd/powerplay: fix memory leak of tdp_table
Diffstat (limited to 'Documentation/watchdog/watchdog-parameters.txt')
0 files changed, 0 insertions, 0 deletions