diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-21 21:53:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-21 21:53:15 -0700 |
| commit | 215a004c61d2f12b130aeb2a9f609275ed6f61bb (patch) | |
| tree | 475fcced95418aaf549bfdbd922f4b2331646281 /drivers/net/ethernet/chelsio/cxgb4vf/sge.c | |
| parent | 29aaee65bc28cc75281dc9fe0998cc5e10ac37f9 (diff) | |
| parent | 8ce261d0bb491da957278cdcba207791f329d1da (diff) | |
Merge tag 'linux-can-fixes-for-3.17-20140821' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2014-08-21
The first patch is from Mirza Krak, it fixes the initialization of the hardware
in the sja1000 driver. The next patch is contributed by Dan Carpenter, it fixes
the error handling in the c_can's probe function. Then there are two patches
for the flexcan driver, one by Alexander Stein, which fixes the resetting of
the bus error interrupt mask, the other one by Sebastian Andrzej Siewior which
adds an additional error state transition message.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4vf/sge.c')
0 files changed, 0 insertions, 0 deletions