diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-16 03:38:49 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-16 03:38:49 +0300 |
commit | 4315ef8d8b2e90e093a52ad31074dd0dafbed654 (patch) | |
tree | 8fc990fc8e589cf5a393fac500a98dd662dbd265 /net/ipv4/ip_sockglue.c | |
parent | 5eff6dadb9f466d15692cc5dd45e1015bf0ec987 (diff) | |
parent | a58518ccf39f86f898a65201518dd8e799b3abeb (diff) | |
download | linux-4315ef8d8b2e90e093a52ad31074dd0dafbed654.tar.xz |
Merge tag 'linux-can-fixes-for-3.19-20150115' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2015-01-15
this is a pull request of 8 patches.
Ahmed S. Darwish contributes 4 fixes for the kvaser_usb driver. The two patches
by Oliver Hartkopp mark the m_can driver as non-ISO, as the CANFD standard was
updated. Roger Quadros's patch for the c_can driver fixes the register access
during RAMINIT. And one patch by my, which updates the MAINTAINERS file, as we
moved the git repos to the kernel.org infrastructure.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
0 files changed, 0 insertions, 0 deletions