diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-09 20:04:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-09 20:04:37 +0100 |
| commit | 14684b93019a2d2ece0df5acaf921924541b928d (patch) | |
| tree | 29cf04da2f22b85b6051b47b3731e91a43d4c94d /drivers/usb/storage/karma.c | |
| parent | Merge branch 'sctp-rfc7829' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-14684b93019a2d2ece0df5acaf921924541b928d.tar.xz linux-14684b93019a2d2ece0df5acaf921924541b928d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
One conflict in the BPF samples Makefile, some fixes in 'net' whilst
we were converting over to Makefile.target rules in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/storage/karma.c')
0 files changed, 0 insertions, 0 deletions