]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Apr 2013 20:43:39 +0000 (16:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Apr 2013 20:43:39 +0000 (16:43 -0400)
commit9ebf25cca8b6a3a5bbe200940b85340d99bac303
treeed99023f742f6c9c8542c9631c8dfac77e71759c
parentcecd244d1c6e06599fb0550760d153b316ec5dfd
parent307180908e23b821ec81df2dc272bbac3525d828
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

Marc Kleine-Budde says:

====================
this is a pull-request for net-next/master. It consists of a patch by
Oliver Hartkopp. In this patch he cleans up the sja1000 header file by
using a common prefix for all sja1000 defines.
====================

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