diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-04-16 16:43:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-16 16:43:39 -0400 |
| commit | 264f0ef766d6e9fcc1b4c3afd288a20ee05ef541 (patch) | |
| tree | ed99023f742f6c9c8542c9631c8dfac77e71759c /tools/perf/scripts/python/bin | |
| parent | fec: Use SIMPLE_DEV_PM_OPS (diff) | |
| parent | can: sja1000: use common prefix for all sja1000 defines (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>
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions