diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-23 23:11:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-24 00:41:27 +0100 |
| commit | 16ae1f223601c44e5cb65c99257ffae003504704 (patch) | |
| tree | 1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6 /fs/dlm/util.c | |
| parent | qedf: fix wrong le16 conversion (diff) | |
| parent | Merge tag 'sound-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| download | linux-16ae1f223601c44e5cb65c99257ffae003504704.tar.xz linux-16ae1f223601c44e5cb65c99257ffae003504704.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/hyperv/netvsc.c
kernel/bpf/hashtab.c
Almost entirely overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/dlm/util.c')
0 files changed, 0 insertions, 0 deletions