projects / profile / common / kernel-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf7bfd7 06e1d1d)
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)
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>

Trivial merge
Domain: SCM / Uncategorized;