diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-03 09:09:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-03 09:09:36 +1000 |
| commit | a20def95401112358bcc90242f252a96084a2d47 (patch) | |
| tree | ec6ed90dbf0a2537a57ed5c29b3fd01da8295061 /net/ipv4/ipmr.c | |
| parent | 52b679f60e2a68af88411f12318675a2424a0e14 (diff) | |
| parent | e8fe4f4b2b7b93048729538321c681c0cff33b39 (diff) | |
Merge tag 'topic/vma-fix-for-4.10-2017-02-02' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes
here's Maarten's backport of the vma fixes for v4.10.
* tag 'topic/vma-fix-for-4.10-2017-02-02' of git://anongit.freedesktop.org/git/drm-intel:
drm/i915: Track pinned vma in intel_plane_state
drm/atomic: Unconditionally call prepare_fb.
Diffstat (limited to 'net/ipv4/ipmr.c')
0 files changed, 0 insertions, 0 deletions