diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-26 20:29:19 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-26 20:30:55 +0400 |
| commit | 69d268b7725d1478cc084d9397b9d045c7f14b0a (patch) | |
| tree | ddc26b9a21b2d55d5f4795b2c58ce69ad751f6ce /drivers/net/ethernet/chelsio/Kconfig | |
| parent | 2b24f192bb01c09c274fc5c963ea688c6d166589 (diff) | |
| parent | 367525c8c20a34560afe1d0c7cca52a44ccd62e9 (diff) | |
| download | linux-69d268b7725d1478cc084d9397b9d045c7f14b0a.tar.xz | |
Merge tag 'linux-can-fixes-for-3.15-20140424' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
this is a pull request for net/master, for the v3.15 release cycle, consisting
of 26 patches.
Thomas Gleixner contributes 21 patches for the c_can driver, which address
several shortcomings in the driver like hardware initialisation, concurrency,
message ordering and poor performance. Two patches Oliver Hartkopp, one adds a
missing lock to the sja1000_isa driver, the other one fixes the return value in
the generic bit time configuration function. And finally a patch by Alexander
Stein, that fixes the slcan driver to use the correct spinlock variant.
To make it 26 patches, Wolfgang Grandegger patch for the c_can_pci
driver, which enables the bus master only for MSI and a patch by
Wolfram Sang, which converts the 'instance' in the c_can driver to the
proper type.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/Kconfig')
0 files changed, 0 insertions, 0 deletions