]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'linux-can-fixes-for-3.17-20140911' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Fri, 12 Sep 2014 22:04:04 +0000 (18:04 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Sep 2014 22:04:04 +0000 (18:04 -0400)
commita7f8289d1291a8e1b9d4e39c770467d3dac0d382
treeb9984cbe11be761fc16ac61da0c7ad25acb6df86
parent381f4dca48d23e155b936b86ccd3ff12f073cf0f
parent8badd65e48c90d66587359d5329c2813088c0f50
Merge tag 'linux-can-fixes-for-3.17-20140911' of git://gitorious.org/linux-can/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2014-09-11

this is a pull request for the current release cycle of a single patch.

The patch by David Jander fixes a scheduling while atomic problem in the
flexcan driver, that was introduced by me in v3.14-rc6.
====================

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