]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 Aug 2013 03:46:16 +0000 (20:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Aug 2013 03:46:41 +0000 (20:46 -0700)
Marc Kleine-Budde says:

====================
this pull-request for net-next consists of a series by Alexander
Shiyan, he cleans up the mcp251x driver. As the first patch touches
arch/arm/mach-pxa, it's acked by Haojian Zhuang.
====================

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

Trivial merge