summaryrefslogtreecommitdiffstats
path: root/include/memory
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-19 14:47:13 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-19 14:47:13 -0700
commit3879d4e3977329607a2a8042483140af3581b5c3 (patch)
treec9e8cd2b3a99ddc917bced812fa2265150d45c44 /include/memory
parenta77f4b4acf5b77f038bc11d3ca9b3af6f0124015 (diff)
parentea53fe0c667ad3cae61d4d71d2be41908ac5c0a4 (diff)
downloadop-kernel-dev-3879d4e3977329607a2a8042483140af3581b5c3.zip
op-kernel-dev-3879d4e3977329607a2a8042483140af3581b5c3.tar.gz
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 <davem@davemloft.net>
Diffstat (limited to 'include/memory')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud