* pull-request: can-next 2012-07-20
@ 2012-07-20 16:27 Marc Kleine-Budde
2012-07-20 18:02 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Marc Kleine-Budde @ 2012-07-20 16:27 UTC (permalink / raw)
To: David Miller; +Cc: Linux Netdev List, linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 2704 bytes --]
Hello David,
the fifth pull request for upcoming v3.6 net-next cleans up and
improves the janz-ican3 driver (6 patches by Ira W. Snyder, one by me).
A patch by Steffen Trumtrar adds imx53 support to the flexcan driver.
And another patch by me, which marks the bit timing constant in the CAN
drivers as "const".
regards, Marc
---
The following changes since commit 769162e38b91e1d300752e666260fa6c7b203fbc:
Merge branch 'net' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (2012-07-19 13:39:27 -0700)
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 3b5c6b9e49f78f07ebcd34b38c1185e57a0fd9eb:
can: janz-ican3: add support for one shot mode (2012-07-20 17:49:05 +0200)
----------------------------------------------------------------
Ira W. Snyder (6):
can: janz-ican3: remove dead code
can: janz-ican3: drop invalid skbs
can: janz-ican3: fix error and byte counters
can: janz-ican3: fix support for CAN_RAW_RECV_OWN_MSGS
can: janz-ican3: avoid firmware lockup caused by infinite bus error quota
can: janz-ican3: add support for one shot mode
Marc Kleine-Budde (2):
can: mark bittiming_const pointer in struct can_priv as const
can: janz-ican3: cleanup of ican3_to_can_frame and can_frame_to_ican3
Steffen Trumtrar (1):
can: flexcan: add 2nd clock to support imx53 and newer
drivers/net/can/at91_can.c | 2 +-
drivers/net/can/bfin_can.c | 2 +-
drivers/net/can/c_can/c_can.c | 2 +-
drivers/net/can/cc770/cc770.c | 2 +-
drivers/net/can/flexcan.c | 47 +++--
drivers/net/can/janz-ican3.c | 241 ++++++++++++++++++++------
drivers/net/can/mcp251x.c | 2 +-
drivers/net/can/mscan/mscan.c | 2 +-
drivers/net/can/pch_can.c | 2 +-
drivers/net/can/sja1000/sja1000.c | 2 +-
drivers/net/can/ti_hecc.c | 2 +-
drivers/net/can/usb/ems_usb.c | 2 +-
drivers/net/can/usb/esd_usb2.c | 2 +-
drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 +-
include/linux/can/dev.h | 2 +-
15 files changed, 226 insertions(+), 88 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: 262 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: pull-request: can-next 2012-07-20
2012-07-20 16:27 pull-request: can-next 2012-07-20 Marc Kleine-Budde
@ 2012-07-20 18:02 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-07-20 18:02 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 20 Jul 2012 18:27:50 +0200
> Hello David,
>
> the fifth pull request for upcoming v3.6 net-next cleans up and
> improves the janz-ican3 driver (6 patches by Ira W. Snyder, one by me).
> A patch by Steffen Trumtrar adds imx53 support to the flexcan driver.
> And another patch by me, which marks the bit timing constant in the CAN
> drivers as "const".
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-20 18:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-20 16:27 pull-request: can-next 2012-07-20 Marc Kleine-Budde
2012-07-20 18:02 ` 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).