diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-04 15:56:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-04 15:56:19 -0400 |
| commit | 19d4e6639fdddce3c27bc91ef91bfe473313be20 (patch) | |
| tree | 9fa08f87181742b75640879d575599d07728f08a /net/nfc | |
| parent | e57edf6b6dba975eceede20b4b13699d4e88cd78 (diff) | |
| parent | 8cf437a0dc2acacb4efa5eb73af9067bba3d2232 (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>
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions