| commit | 264f0ef766d6e9fcc1b4c3afd288a20ee05ef541 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Apr 16 16:43:39 2013 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue Apr 16 16:43:39 2013 -0400 |
| tree | ed99023f742f6c9c8542c9631c8dfac77e71759c | |
| parent | bf7bfd7ff0a8e85c5f469a24c27d4dd1eb756104 [diff] | |
| parent | 06e1d1d71876c75bf4a9d3b310c1b4df34e8be69 [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>