diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-25 05:16:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-25 05:16:49 +0200 |
| commit | fb78cdbbf4d534ffcf64c386c151187f5f475202 (patch) | |
| tree | 6c5cfec97653de80589230cedae7de080b115074 /drivers/net/ethernet/freescale/gianfar_ptp.c | |
| parent | ipv6: Set default hoplimit as zero. (diff) | |
| parent | can: sja1000: fix/add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boards (diff) | |
| download | linux-fb78cdbbf4d534ffcf64c386c151187f5f475202.tar.xz linux-fb78cdbbf4d534ffcf64c386c151187f5f475202.zip | |
Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
here are two patches for the v3.7 release cycle. A patch by Wolfgang Grandegger
for the flexcan driver, which switches off a workaround on the imx6q that is
not needed, because the hardware is not affected by that bug. And a patch by
Stephane Grosjean which updates the pci device table for the peak pci sja1000
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar_ptp.c')
0 files changed, 0 insertions, 0 deletions