tree 475fcced95418aaf549bfdbd922f4b2331646281
parent 29aaee65bc28cc75281dc9fe0998cc5e10ac37f9
parent 8ce261d0bb491da957278cdcba207791f329d1da
author David S. Miller <davem@davemloft.net> 1408683195 -0700
committer David S. Miller <davem@davemloft.net> 1408683195 -0700
mergetag object 8ce261d0bb491da957278cdcba207791f329d1da
 type commit
 tag linux-can-fixes-for-3.17-20140821
 tagger Marc Kleine-Budde <mkl@pengutronix.de> 1408611057 +0200
 
 linux-can-fixes-for-3.17-20140821
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlP1svIACgkQjTAFq1RaXHPV6wCfWtoj6987iIwKYSuz9q8nUB03
 YtsAn0o3r44apjJT6uwEIfFR1M6NCuQK
 =5Bee
 -----END PGP SIGNATURE-----

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>