Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next into cpsw
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Aug 2013 03:49:59 +0000 (20:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Aug 2013 03:49:59 +0000 (20:49 -0700)
Marc Kleine-Budde says:

====================
another pull-request for net-next. It consists of two patches by Libo
Chen, the at91 and flexcan driver make use of platform_set_drvdata()
rather than open coding it. Chen Gang improves the error checking in
the c_can_platform driver's probe function.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge