Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can

Browse source

Marc Kleine-Budde says:

====================
here are three patches for the v3.7 release cycle. Two patches by Peter Senna
Tschudin which fix the return values in the error handling path of the sja1000
peak pci and pcmcia driver. And one patch by myself that fixes a compile
breakage of the mpc5xxx_can mscan driver due to a section conflict.
====================

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

...

This commit is contained in:

David S. Miller 2012-10-04 15:56:19 -04:00

parent e57edf6b6d 8cf437a0dc

commit 19d4e6639f

3 changed files with 9 additions and 5 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

8

drivers/net/can/mscan/mpc5xxx_can.c

View file

2

drivers/net/can/sja1000/peak_pci.c

View file

4

drivers/net/can/sja1000/peak_pcmcia.c

View file