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

Browse source

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>

...

This commit is contained in:

David S. Miller 2012-07-17 01:34:11 -07:00

parent 7df2dc6bd4 da78b7998e

commit c41e4130a2

3 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/net/can/flexcan.c

View file

2

drivers/net/can/mscan/mpc5xxx_can.c

View file

2

drivers/net/can/softing/softing_main.c

View file