| commit | 54f0e9ba95c8011b8c90b0d20075f0a9491346a9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jul 20 10:56:03 2012 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jul 20 10:56:03 2012 -0700 |
| tree | ba0b60b3b540c2dfcd57d7b7b2dcb0c4c6dcd54d | |
| parent | 90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857 [diff] | |
| parent | 3b5c6b9e49f78f07ebcd34b38c1185e57a0fd9eb [diff] |
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 cleans up and improves the janz-ican3 driver (6 patches by Ira W. Snyder, one by me). A patch by Steffen Trumtrar adds imx53 support to the flexcan driver. And another patch by me, which marks the bit timing constant in the CAN drivers as "const". ==================== Signed-off-by: David S. Miller <davem@davemloft.net>