From: David S. Miller Date: Fri, 22 Aug 2014 04:53:15 +0000 (-0700) Subject: Merge tag 'linux-can-fixes-for-3.17-20140821' of git://gitorious.org/linux-can/linux-can X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=215a004c61d2f12b130aeb2a9f609275ed6f61bb;p=openwrt%2Fstaging%2Fblogic.git 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 --- 215a004c61d2f12b130aeb2a9f609275ed6f61bb