]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7df0f7 511b435)
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)
commit474231bb7d4b48ecb5378bddd881cc245fc35b01
treeed99023f742f6c9c8542c9631c8dfac77e71759ctree | snapshot
parentc7df0f757dc375d7bf9a0deab0054cedac540a00commit | diff
parent511b43529b5137c63089ab3a03386a223d9625bdcommit | diff
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>
Linux Kernel Source Tree.