diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-05 00:29:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-05 00:29:14 -0800 |
| commit | adfde05166174ef1c4733dd7cfd4dc2b5f710ac8 (patch) | |
| tree | 055c58ba9b8e8d1b29e482f599286be125202df2 /Kconfig | |
| parent | f86b4ae6ac772f8177bfdd460ea43c319ca3f92d (diff) | |
| parent | a9ca6e13d66042b3ac18d1352b88b7cd0da8fc21 (diff) | |
| download | linux-adfde05166174ef1c4733dd7cfd4dc2b5f710ac8.tar.bz2 | |
Merge tag 'linux-can-next-for-3.20-20150204' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2015-02-04
this is a pull request of 2 patches for net-next/master.
Nicholas Mc Guire contributes a patch for the janz-ican3 driver to fix
a mismatch in an assignment. Ahmed S. Darwish contributes a patch for
the kvaser_usb driver, to make the driver more robust during the
bus-off handling.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Kconfig')
0 files changed, 0 insertions, 0 deletions