diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-11-28 22:10:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-28 22:10:54 -0800 |
| commit | e561bb29b650d2817d10a4858f1817836ed08399 (patch) | |
| tree | 0bc92b5bb8a287a8e4a88732f3c64b56d126da58 /drivers/net/can/rcar/Kconfig | |
| parent | net: qualcomm: rmnet: remove set but not used variables 'ip_family, fc_seq, qos_id' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-e561bb29b650d2817d10a4858f1817836ed08399.tar.xz linux-dev-e561bb29b650d2817d10a4858f1817836ed08399.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/rcar/Kconfig')
0 files changed, 0 insertions, 0 deletions