diff options
author | Dave Airlie <airlied@redhat.com> | 2018-05-18 07:08:53 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-05-18 07:08:53 +0300 |
commit | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch) | |
tree | f829e8a26fc768666eb5f827bf5817892ea7e46c /drivers/net/macsec.c | |
parent | 315852b422972e6ebb1dfddaadada09e46a2681a (diff) | |
parent | 76ef6b28ea4f81c3d511866a9b31392caa833126 (diff) | |
download | linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.tar.xz |
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/net/macsec.c')
0 files changed, 0 insertions, 0 deletions