diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-07-20 10:56:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-20 10:56:03 -0700 |
| commit | 54f0e9ba95c8011b8c90b0d20075f0a9491346a9 (patch) | |
| tree | ba0b60b3b540c2dfcd57d7b7b2dcb0c4c6dcd54d /drivers/net/xen-netfront.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem (diff) | |
| parent | can: janz-ican3: add support for one shot mode (diff) | |
| download | linux-dev-54f0e9ba95c8011b8c90b0d20075f0a9491346a9.tar.xz linux-dev-54f0e9ba95c8011b8c90b0d20075f0a9491346a9.zip | |
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>
Diffstat (limited to 'drivers/net/xen-netfront.c')
0 files changed, 0 insertions, 0 deletions