summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'can/at91-sam9x5' of git://git.pengutronix.de/git/mkl/linux-2.6David S. Miller2011-06-072-112/+259
|\
| * net/can: allow CAN_AT91 on AT91SAM9X5Uwe Kleine-König2011-06-061-2/+3
| * can: at91_can: add support for the AT91SAM9X5 SOCsMarc Kleine-Budde2011-06-061-14/+55
| * can: at91_can: register mb0 sysfs entry only on at91sam9263Marc Kleine-Budde2011-06-061-1/+3
| * can: at91_can: add id_table and convert prime mailbox constats to functionsMarc Kleine-Budde2011-06-061-38/+99
| * can: at91_can: convert derived mailbox constants into functionsMarc Kleine-Budde2011-06-061-42/+83
| * can: at91_can: rename AT91_MB_RX_MASK to AT91_IRQ_MB_RXMarc Kleine-Budde2011-06-061-9/+9
| * can: at91_can: directly define AT91_MB_RX_LASTMarc Kleine-Budde2011-06-061-2/+1
| * can: at91_can: let get_tx_* functions return unsigned intMarc Kleine-Budde2011-06-061-3/+3
| * can: at91_can: don't copy data to rx'ed RTR framesMarc Kleine-Budde2011-06-061-4/+6
| * can: at91_can: fix comment about priv->tx_nextMarc Kleine-Budde2011-06-061-1/+1
| * can: at91_can: don't align struct definitionsMarc Kleine-Budde2011-06-061-17/+17
* | net: remove interrupt.h inclusion from netdevice.hAlexey Dobriyan2011-06-061-0/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-06-041-3/+2
|\
| * drivers/net/can/flexcan.c: add missing clk_putJulia Lawall2011-06-021-3/+2
* | Revert "tty: make receive_buf() return the amout of bytes received"Linus Torvalds2011-06-041-6/+3
* | mfd: Use mfd cell platform_data for janz cells platform bitsSamuel Ortiz2011-05-261-2/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2011-05-241-1/+1
|\ \
| * | pcmcia: Convert pcmcia_device_id declarations to constJoe Perches2011-05-061-1/+1
* | | Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2011-05-231-3/+6
|\ \ \ | |_|/ |/| |
| * | tty: make receive_buf() return the amout of bytes receivedFelipe Balbi2011-04-221-3/+6
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-05-232-2/+2
|\ \ \
| * | | treewide: fix a few typos in commentsJustin P. Mattock2011-05-101-1/+1
| * | | Merge branch 'master' into for-nextJiri Kosina2011-04-2613-36/+33
| |\ \ \ | | | |/ | | |/|
| * | | treewide: remove extra semicolonsJustin P. Mattock2011-04-101-1/+1
* | | | drivercore: revert addition of of_match to struct deviceGrant Likely2011-05-181-2/+5
* | | | slcan: fix ldisc->open retvalOliver Hartkopp2011-05-101-1/+3
* | | | can: fix SJA1000 dlc for RTR packetsKurt Van Dijck2011-05-051-1/+1
| |/ / |/| |
* | | net: can: mscan: fix build breakage in mpc5xxx_canAnatolij Gustschin2011-04-131-1/+1
| |/ |/|
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-111-1/+2
|\ \
| * | can: mcp251x: Allow pass IRQ flags through platform data.Enric Balletbo i Serra2011-04-061-1/+2
* | | Fix common misspellingsLucas De Marchi2011-03-3110-15/+15
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-03-292-15/+10
|\ \
| * | can: c_can: Fix tx_bytes accountingJan Altenberg2011-03-271-1/+1
| * | can: c_can_platform: fix irq check in probeMarc Kleine-Budde2011-03-271-4/+5
| * | can: c_can: disable one shot mode until driver is fixedMarc Kleine-Budde2011-03-271-10/+4
* | | mfd: mfd_cell is now implicitly available to janz driversAndres Salomon2011-03-231-1/+2
|/ /
* / can: c_can: Do basic c_can configuration _before_ enabling the interruptsJan Altenberg2011-03-211-3/+3
|/
* Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-03-162-11/+13
|\
| * dt/net: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-282-11/+13
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-03-151-3/+3
|\ \
| * | can: wrong index used in inner looproel kluin2011-03-141-3/+3
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-03-031-0/+1
|\| |
| * | CAN: add controller hardware name for Softing cardsKurt Van Dijck2011-02-281-0/+1
| |/
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-02-195-5/+6
|\|
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-02-181-1/+1
| |\
| | * net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTINGKurt Van Dijck2011-02-141-1/+1
| * | Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-02-181-1/+1
| |\ \
| | * | workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'Tejun Heo2011-02-161-1/+1
| | |/
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger...Linus Torvalds2011-02-151-1/+1
| |\ \ | | |/ | |/|