projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e57edf6 8cf437a)
Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Thu, 4 Oct 2012 19:56:19 +0000 (15:56 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Oct 2012 19:56:19 +0000 (15:56 -0400)
commit19d4e6639fdddce3c27bc91ef91bfe473313be20
tree9fa08f87181742b75640879d575599d07728f08atree | snapshot
parente57edf6b6dba975eceede20b4b13699d4e88cd78commit | diff
parent8cf437a0dc2acacb4efa5eb73af9067bba3d2232commit | diff
Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can

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>
John Crispins staging tree