summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
Commit message (Expand)AuthorAgeFilesLines
* can: sja1000: fix compilation on x86Marc Kleine-Budde2012-12-161-1/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-12-1342-184/+3655
|\
| * drivers/net: fix up function prototypes after __dev* removalsGreg Kroah-Hartman2012-12-0710-21/+14Star
| * can: remove __dev* attributesBill Pemberton2012-12-0324-116/+116
| * Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-nextDavid S. Miller2012-11-309-43/+1Star
| |\
| | * can: pcan_usb_core: remove obsolete variable open_timeMarc Kleine-Budde2012-11-292-6/+0Star
| | * can: esd_usb2: remove obsolete variable open_timeMarc Kleine-Budde2012-11-291-10/+0Star
| | * can: ems_usb: remove obsolete variable open_timeMarc Kleine-Budde2012-11-291-7/+0Star
| | * can: sja1000: remove obsolete variable open_timeMarc Kleine-Budde2012-11-292-9/+0Star
| | * can: mscan: remove obsolete variable open_timeMarc Kleine-Budde2012-11-292-9/+0Star
| | * can: Do not call dev_put if restart timer is running upon closeAlexander Stein2012-11-291-2/+1Star
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-11-292-4/+12
| |\ \ | | |/ | |/|
| * | can: mpc5xxx_can: add MODULE_DEVICE_TABLEMarc Kleine-Budde2012-11-271-0/+1
| * | can: c_can_platform: add MODULE_DEVICE_TABLEMarc Kleine-Budde2012-11-271-0/+2
| * | can: at91_can: add MODULE_DEVICE_TABLEMarc Kleine-Budde2012-11-271-0/+1
| * | can: flexcan: add MODULE_DEVICE_TABLEMarc Kleine-Budde2012-11-271-0/+2
| * | can: cc770_platform: add MODULE_ALIAS and MODULE_DEVICE_TABLEMarc Kleine-Budde2012-11-271-0/+2
| * | can: sja1000_platform: add MODULE_ALIASMarc Kleine-Budde2012-11-271-0/+1
| * | can: ti_hecc: add MODULE_ALIASMarc Kleine-Budde2012-11-271-0/+1
| * | can: bfin_can: add MODULE_ALIASMarc Kleine-Budde2012-11-271-0/+1
| * | can: sja1000: Make sja1000_of_platform selectable and compilable on SPARCAndreas Larsson2012-11-272-3/+5
| * | can: kvaser_usb: Add support for Kvaser CAN/USB devicesOlivier Sobrie2012-11-273-0/+1657
| * | can: c_can: Add d_can raminit supportAnilKumar Ch2012-11-273-1/+42
| * | can: grcan: Add device driver for GRCAN and GRHCAN coresAndreas Larsson2012-11-153-0/+1766
| * | can: janz-ican3: Fix the usage of wait_for_completion_timeoutChuansheng Liu2012-11-151-2/+2
| * | can: usb: esd_usb2: Add support for CAN-USB/MicroMatthias Fuchs2012-11-151-6/+25
| * | can: usb: esd_usb2: Add support for listen-only modeMatthias Fuchs2012-11-151-0/+4
| * | can: sja1000: plx_pci: add support for Connect Tech Inc's Canpro/104-Plus Opt...Muhammad Ghias2012-11-152-0/+20
* | | Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-121-2/+1Star
|\ \ \ | |_|/ |/| |
| * | arm: at91: move platfarm_data to include/linux/platform_data/atmel.hJean-Christophe PLAGNIOL-VILLARD2012-11-061-2/+1Star
| |/
* / can: peak_usb: fix hwtstamp assignmentOliver Hartkopp2012-11-262-4/+12
|/
* can: sja1000: fix/add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boardsStephane Grosjean2012-10-241-2/+11
* can: flexcan: disable bus error interrupts for the i.MX6qWolfgang Grandegger2012-10-231-3/+16
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-10-053-5/+9
|\
| * can: mpc5xxx_can: fix section type conflictMarc Kleine-Budde2012-10-041-4/+4
| * can: peak_pcmcia: fix error return codePeter Senna Tschudin2012-10-041-1/+3
| * can: peak_pci: fix error return codePeter Senna Tschudin2012-10-041-0/+2
* | sections: fix section conflicts in drivers/netAndi Kleen2012-10-052-2/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-10-0210-53/+302
|\
| * flexcan: disable bus error interrupts for the i.MX28Wolfgang Grandegger2012-10-011-10/+19
| * Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-nextDavid S. Miller2012-09-291-3/+0Star
| |\
| | * can: c_can: fix segfault during rmmodAnilKumar Ch2012-09-271-3/+0Star
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-09-282-4/+2Star
| |\ \ | | |/ | |/|
| * | can: sja1000: Add support for listen-only mode and one-shot modeAndreas Larsson2012-09-221-7/+24
| * | can: mscan-mpc5xxx: fix return value check in mpc512x_can_get_clock()Wei Yongjun2012-09-211-2/+2
| * | can: usb: peak: rename peak_usb dump_mem functionRandy Dunlap2012-09-213-9/+9
| * | can: c_can: Adopt pinctrl supportAnilKumar Ch2012-09-211-0/+7
| * | can: c_can: Add d_can suspend resume supportAnilKumar Ch2012-09-213-0/+148
| * | can: c_can: Add runtime PM support to Bosch C_CAN/D_CAN controllerAnilKumar Ch2012-09-213-2/+49
| * | can: c_can: Add device tree support to Bosch C_CAN/D_CAN controllerAnilKumar Ch2012-09-211-17/+38