]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'linux-can-fixes-for-4.0-20150314' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Sat, 14 Mar 2015 18:35:26 +0000 (14:35 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 14 Mar 2015 18:35:26 +0000 (14:35 -0400)
commit07c2171570247639d24f2f5f1565cc358192d43e
tree769341072aeb277f71beed94b5b73f00b9dce46f
parentc8e2c80d7ec00d020320f905822bf49c5ad85250
parenta9dc960c37b0d4eb192598dc4c94276270454514
Merge tag 'linux-can-fixes-for-4.0-20150314' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
Hello David, this is a pull request for net/master, consisting of two patches:

In the first patch Michal Simek enables the xilinx CAN driver for ARM64. The
second patch by Ahmed S. Darwish fixes a race condition in the tx-queue of the
kvaser_usb driver.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>