diff options
author | David S. Miller <davem@davemloft.net> | 2017-12-17 06:11:55 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-17 06:11:55 +0300 |
commit | c30abd5e40dd863f88e26be09b6ce949145a630a (patch) | |
tree | 5b25362084308502a336d8da26b8dc7430d7c812 /include/uapi/linux/zorro_ids.h | |
parent | 28dc4c8f4557d82e9be020e85e2362239270e704 (diff) | |
parent | f3b5ad89de16f5d42e8ad36fbdf85f705c1ae051 (diff) | |
download | linux-c30abd5e40dd863f88e26be09b6ce949145a630a.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler
and one in the meson-gxl PHY driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/zorro_ids.h')
0 files changed, 0 insertions, 0 deletions