]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes-for-3.13-20131127' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Thu, 28 Nov 2013 23:40:10 +0000 (18:40 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Nov 2013 23:40:10 +0000 (18:40 -0500)
commit3903ec99099a5c528f692c11a7676e663c95c6d0
tree3613de06b3b4dfdcbf66208b2006ebb7fe18c067
parentae679ba8f9c8e3f9590b2a11bda35f2c86c3163c
parent64e7dfbe8b089f3d2f1c12c90e8d596e4018e902
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>