diff options
author | Dave Airlie <airlied@redhat.com> | 2017-04-11 00:40:42 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-04-11 00:40:42 +0300 |
commit | b769fefb68cd70385d68220ae341e5a10723fbc0 (patch) | |
tree | a2881410c9dc5a3474619d155fac981cfbd4ee8f /drivers/net/ethernet/intel/e1000e/ich8lan.c | |
parent | 1420f63b8207e966f54caec26d08abdc2ff37193 (diff) | |
parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
download | linux-b769fefb68cd70385d68220ae341e5a10723fbc0.tar.xz |
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6
drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/ich8lan.c')
0 files changed, 0 insertions, 0 deletions