diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-06-12 10:11:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-06-12 10:11:14 +1000 |
| commit | 950c37073aae9c2edbd0ba742fd668b4a355eea3 (patch) | |
| tree | 37d846270eaa4efd1624b6066d38c43217f6c677 /fs/hugetlbfs | |
| parent | cff100f5d746465ca40e61cf296321ecf07d3f1c (diff) | |
| parent | ee18e599251ed06bf0c8ade7c434a0de311342ca (diff) | |
| download | linux-950c37073aae9c2edbd0ba742fd668b4a355eea3.tar.gz linux-950c37073aae9c2edbd0ba742fd668b4a355eea3.tar.bz2 linux-950c37073aae9c2edbd0ba742fd668b4a355eea3.zip | |
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Two regression reverts, and two fixes, one for a dpm boot freeze.
* 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: Make sure radeon_vm_bo_set_addr always unreserves the BO
Revert "drm/radeon: adjust pll when audio is not enabled"
Revert "drm/radeon: don't share plls if monitors differ in audio support"
drm/radeon: fix freeze for laptop with Turks/Thames GPU.
Diffstat (limited to 'fs/hugetlbfs')
0 files changed, 0 insertions, 0 deletions