From: David S. Miller <davem@davemloft.net>
Date: Tue, 17 Jul 2012 08:34:11 +0000 (-0700)
Subject: Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
X-Git-Tag: MMI-PSA29.97-13-9~16302^2~138
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c41e4130a248c8220889f6e6636b47595e369386;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

Marc Kleine-Budde says:

====================
the fifth pull request for upcoming v3.6 net-next. The first two
patches (created by me) add const qualifiers to the flexcan and
mpc5xxx_can driver. The next patch by Julia Lawall fixes a return value
problem in the error path of the softing driver.
====================

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

c41e4130a248c8220889f6e6636b47595e369386