diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-08-02 11:16:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-08-02 11:16:02 +1000 |
| commit | 753e7c8cbd8c503b962294303c7b5e9ea8513443 (patch) | |
| tree | 3244fa8ede2fd6d93283692296e0ffa3438deb07 /fs/nfs/nfs4super.c | |
| parent | 1cf915d305b6e1d57db6c35c208016f9747ba3c6 (diff) | |
| parent | d0e62ef6ed257715a88d0e5d7cd850a1695429e2 (diff) | |
Merge branch 'linux-4.8' of git://github.com/skeggsb/linux into drm-next
Runtime PM fixes, fbcon and nv30 fix.
* 'linux-4.8' of git://github.com/skeggsb/linux:
drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup
drm/nouveau/acpi: fix lockup with PCIe runtime PM
drm/nouveau/acpi: check for function 0x1B before using it
drm/nouveau/acpi: return supported DSM functions
drm/nouveau/acpi: ensure matching ACPI handle and supported functions
drm/nouveau/fbcon: fix font width not divisible by 8
Diffstat (limited to 'fs/nfs/nfs4super.c')
0 files changed, 0 insertions, 0 deletions