From: David S. Miller Date: Tue, 19 Jun 2012 21:47:13 +0000 (-0700) Subject: Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3879d4e3977329607a2a8042483140af3581b5c3;p=linux-beck.git Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next Marc Kleine-Budde says: ==================== here is our second pull request for net-next. In this series Federico Vaga adds a pci driver for c_can/d_can hardware using the existing generic c_can driver. The remaining 6 patches are by Oliver Hartkopp. He adds CANFD support to the CAN stack while keeping binary compatibility for existing applications. CANFD is an extension to the existing CAN standard, it allows longer CAN frames and/or higher data rates. There's no real hardware available yet, but this series adds CANFD support to the vcan driver. ==================== Signed-off-by: David S. Miller --- 3879d4e3977329607a2a8042483140af3581b5c3