diff options
| author | David S. Miller <davem@davemloft.net> | 2013-11-28 18:40:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-28 18:40:10 -0500 |
| commit | e63e60be62699e74c3e40711c50918b3c007db0a (patch) | |
| tree | 3613de06b3b4dfdcbf66208b2006ebb7fe18c067 /drivers/net/ethernet/via | |
| parent | ae5e8127b712313ec1b99356019ce9226fea8b88 (diff) | |
| parent | 1a3e5173f5e72cbf7f0c8927b33082e361c16d72 (diff) | |
| download | linux-e63e60be62699e74c3e40711c50918b3c007db0a.tar.bz2 | |
Merge branch 'fixes-for-3.13-20131127' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
here's a pull request for v3.13, i.e. net/master. It consists of a patch by
Oliver Hartkopp which fixes some corner cases in the interrupt handler of the
sja1000 driver. Then there are two patches for the c_can dirver. One by me,
which fixes a runtime pm related "scheduling while atomic" error and patch by
Holger Bechtold that fixes the calculation of the transmitted bytes.
The fourth patch is by me, it corrects the clock usage in the flexcan
driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/via')
0 files changed, 0 insertions, 0 deletions