From: David S. Miller Date: Tue, 16 Apr 2013 20:43:39 +0000 (-0400) Subject: Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next X-Git-Tag: firefly_0821_release~3680^2~548^2~113 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=264f0ef766d6e9fcc1b4c3afd288a20ee05ef541;p=firefly-linux-kernel-4.4.55.git 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 --- 264f0ef766d6e9fcc1b4c3afd288a20ee05ef541