diff options
author | David S. Miller <davem@davemloft.net> | 2017-04-20 16:35:33 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-04-20 16:35:33 +0200 |
commit | 7b9f6da175f9387ebfc202f35e0d39514899ab19 (patch) | |
tree | a884c05aaeff40d8f80831549cccc820dcdd0f4f /drivers/zorro | |
parent | net: cx89x0: move attribute declaration before struct keyword (diff) | |
parent | sh_eth: unmap DMA buffers when freeing rings (diff) | |
download | linux-7b9f6da175f9387ebfc202f35e0d39514899ab19.tar.xz linux-7b9f6da175f9387ebfc202f35e0d39514899ab19.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A function in kernel/bpf/syscall.c which got a bug fix in 'net'
was moved to kernel/bpf/verifier.c in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/zorro')
0 files changed, 0 insertions, 0 deletions