| commit | c02b3741eb99a1ec733e6134c53ba59e43e19e97 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Jan 17 00:00:25 2018 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Wed Jan 17 00:10:42 2018 -0500 |
| tree | ff7dd96c32dec2abe530e7101378443dabcb8962 | |
| parent | 7018d1b3f20fb4308ed9bc577160cb8ffb79b62a [diff] | |
| parent | 8cbab92dff778e516064c13113ca15d4869ec883 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Overlapping changes all over. The mini-qdisc bits were a little bit tricky, however. Signed-off-by: David S. Miller <davem@davemloft.net>