summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/dec/tulip/timer.c
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2019-07-10 16:51:35 +0300
committerRodrigo Vivi <rodrigo.vivi@intel.com>2019-07-10 16:51:35 +0300
commit88c90e800675b98008d5ebe5e81245910417a22d (patch)
treeeb06c935cc3363a284382fce1f6721f3a862654e /drivers/net/ethernet/dec/tulip/timer.c
parentcaceff96d5b7b487da19c0916e0048ff8f1709a9 (diff)
parent4cf643a39221af24a151ad2cff4e3f95f12f368e (diff)
downloadlinux-88c90e800675b98008d5ebe5e81245910417a22d.tar.xz
Merge drm/drm-next into drm-intel-next-queued
Catch-up with 5.2. Specially to remove a drm-tip merge fixup around intel_workarounds. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/net/ethernet/dec/tulip/timer.c')
0 files changed, 0 insertions, 0 deletions