* pull-request: can-next 2013-04-16
@ 2013-04-16 10:51 Marc Kleine-Budde
2013-04-16 20:41 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Marc Kleine-Budde @ 2013-04-16 10:51 UTC (permalink / raw)
To: Linux Netdev List; +Cc: linux-can@vger.kernel.org
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: pull-request: can-next 2013-04-16
2013-04-16 10:51 pull-request: can-next 2013-04-16 Marc Kleine-Budde
@ 2013-04-16 20:41 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-04-16 20:41 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-16 20:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-16 10:51 pull-request: can-next 2013-04-16 Marc Kleine-Budde
2013-04-16 20:41 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).