pull-request: can-next 2013-04-16

pull-request: can-next 2013-04-16

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1578 bytes --]

Hello David,

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.

regards,
Marc

---

The following changes since commit 61f47132dcba1eacf8fd8e64488d0b6d4bcbe4a0:

  Merge branch 'sync_multiple' (2013-04-15 16:10:53 -0400)

are available in the git repository at:


  git://gitorious.org/linux-can/linux-can-next.git for-davem

for you to fetch changes up to 06e1d1d71876c75bf4a9d3b310c1b4df34e8be69:

  can: sja1000: use common prefix for all sja1000 defines (2013-04-16 12:39:14 +0200)

----------------------------------------------------------------
Oliver Hartkopp (1):
      can: sja1000: use common prefix for all sja1000 defines

 drivers/net/can/sja1000/ems_pci.c     |   6 +-
 drivers/net/can/sja1000/ems_pcmcia.c  |   6 +-
 drivers/net/can/sja1000/kvaser_pci.c  |   4 +-
 drivers/net/can/sja1000/peak_pci.c    |   2 +-
 drivers/net/can/sja1000/peak_pcmcia.c |   8 +--
 drivers/net/can/sja1000/plx_pci.c     |  12 ++--
 drivers/net/can/sja1000/sja1000.c     | 126 +++++++++++++++++-----------------
 drivers/net/can/sja1000/sja1000.h     |  68 +++++++++---------
 8 files changed, 117 insertions(+), 115 deletions(-)

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

Re: pull-request: can-next 2013-04-16

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 16 Apr 2013 12:51:26 +0200

> 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.

Pulled, thanks.