diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-04 23:30:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-04 23:30:12 +0200 |
| commit | 23eb45fce933ec09601a1c3f6e1c56190c9af301 (patch) | |
| tree | bc5f261d37465d9bd7c17e338e83b7d7ef8c9ce9 /scripts | |
| parent | net/mlx4_core: Keep VF assigned MAC in the PF admin table (diff) | |
| parent | net: can: peak_usb: Do not do dma on the stack (diff) | |
| download | linux-23eb45fce933ec09601a1c3f6e1c56190c9af301.tar.xz linux-23eb45fce933ec09601a1c3f6e1c56190c9af301.zip | |
Merge branch 'fixes-for-3.10' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
here are there fixes for the v3.10 release cycle:
The first patch by Jonas Peterson and Olivier Sobrie fixes the reception of CAN
frames on Kvaser's "USBcan Pro" and "USBcan R" type hardware.
The last two patches by Olivier Sobrie (for esd_usb2) and me (for peak_usb)
change the memory handling for the USB messages from stack to kmalloc(), as
memory used for DMA should not be allocated on stack.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions