diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-02-21 22:39:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-21 22:39:32 -0500 |
| commit | 86310cc42ddf300a9482c613720e7811abec2c4c (patch) | |
| tree | 5a1958645f28e47bff39bce50cf9f8da6c9eeae6 /net/unix/af_unix.c | |
| parent | Merge branch 'bpf-helper-improvements' (diff) | |
| parent | can: ifi: Add IFI CANFD IP support (diff) | |
| download | wireguard-linux-86310cc42ddf300a9482c613720e7811abec2c4c.tar.xz wireguard-linux-86310cc42ddf300a9482c613720e7811abec2c4c.zip | |
Merge tag 'linux-can-next-for-4.6-20160220' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2016-02-20
this is a pull request of 9 patch for net-next/master.
The first 3 patches are from Damien Riegel, they add support for
Technologic Systems IP core to tje sja100 driver. The next patches 6 by
Marek Vasut (including one my me) first clean sort the CAN driver's
Kconfig and Makefiles and then add support for the IFI CANFD IP core.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions