| commit | 4dc6758d7824a6d25717ccceefc488cafdb07210 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Nov 10 10:00:18 2017 +0900 |
| committer | David S. Miller <davem@davemloft.net> | Fri Nov 10 10:00:18 2017 +0900 |
| tree | 992e5d5996910af35a5c12fe94da14d0bb167452 | |
| parent | 19aeeb9f46cb4b9474ebeb50cb01b9a1adba73b8 [diff] | |
| parent | 3fefc31843cfe2b5f072efe11ed9ccaf6a7a5092 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Simple cases of overlapping changes in the packet scheduler. Must easier to resolve this time. Which probably means that I screwed it up somehow. Signed-off-by: David S. Miller <davem@davemloft.net>