diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-09 15:41:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-09 15:41:00 -0400 |
| commit | d03725044a2a75090d1b5b46ed5d87945d2d0116 (patch) | |
| tree | 16d1db41b66bd4f8ca6f95d06a9a819534dcaeb3 /net/packet/af_packet.c | |
| parent | c247f0534cc5a5a547a343903f42295a471844e2 (diff) | |
| parent | f7214cf29ca6c977ad2c428f2b832e9c66f2ee1b (diff) | |
Merge tag 'linux-can-fixes-for-4.0-20150309' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2015-03-09
this is a pull request for net/master for the 4.0 release cycle, it consists of
6 patches:
A patch by Oliver Hartkopp fixes a long outstanding bug in the infrastructure,
which leads to skb_under_panics when CAN interfaces are used by AF_PACKET
sockets e.g. by dhclient. Stephane Grosjean contributes a patch for the
peak_usb driver which adds a missing initialization. Two patches by Ahmed S.
Darwish fix problems in the kvaser_usb driver. Followed by two patches by
myself, updating the MAINTAINERS file
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet/af_packet.c')
0 files changed, 0 insertions, 0 deletions