diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-24 03:36:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-24 03:36:37 +0100 |
| commit | 7ef70aabe073380b150ee520a2605ab997a8e9d4 (patch) | |
| tree | b2c79540197f42944d4cb382e7bca523d32bbd95 /net/ipv4/ip_sockglue.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | can: flexcan: Deferred on Regulator return EPROBE_DEFER (diff) | |
| download | linux-7ef70aabe073380b150ee520a2605ab997a8e9d4.tar.xz linux-7ef70aabe073380b150ee520a2605ab997a8e9d4.zip | |
Merge tag 'linux-can-fixes-for-4.0-20150322' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2015-03-22
this is a pull-request of 7 patches for net/master.
Ahmed S. Darwish fixes another two problems in the kvaser_usb driver. A patch
by Colin Ian King for the gs_usb driver adds a missing check for kzalloc
allocation failures. Two patches by Stephane Grosjean for the peak_usb driver
add missing support for ISO / non-ISO mode switching. Andri Yngvason
contributes a patch to fix the state handling in the flexcan driver. The last
patch by Andreas Werner for the flexcan driver add missing EPROBE_DEFER
handling for the transceiver regulator.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
0 files changed, 0 insertions, 0 deletions