projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7112f8b e735def)
Merge branch 'stmmac-Frame-Preemption-fixes'
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Jan 2020 19:29:44 +0000 (11:29 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Jan 2020 19:29:44 +0000 (11:29 -0800)
commit916d08f640092397f403924f9b061d7d883a8217
treea2973e5cdcf933d7e07212db76266d359bf5131ftree | snapshot
parent7112f8b075b4565fb81bcd472433f9f1eea3dcb8commit | diff
parente735def0186770d9a2904bee6ee82a4e6dd99578commit | diff
Merge branch 'stmmac-Frame-Preemption-fixes'

Jose Abreu says:

====================
net: stmmac: Frame Preemption fixes

Two single fixes for the -next tree for recently introduced Frame Preemption
feature.

1) and 2) fixes the disabling of Frame Preemption that was not being correctly
handled because of a missing return.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git