summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-08-202-3/+3
|\
| * drivers/net/can/sja1000/plx_pci.c: eliminate double freeJulia Lawall2011-08-141-2/+2
| * slcan: ldisc generated skbs are received in softirq contextOliver Hartkopp2011-08-111-1/+1
* | flexcan: Prefer device tree clock frequency if available.holt@sgi.com2011-08-181-9/+25
* | flexcan: Add of_match to platform_device definition.holt@sgi.com2011-08-181-1/+12
* | flexcan: Abstract off read/write for big/little endian.holt@sgi.com2011-08-181-57/+83
* | flexcan: Remove #include <mach/clock.h>holt@sgi.com2011-08-181-2/+0Star
* | net/can/mscan: add __iomem annotationsMarc Kleine-Budde2011-08-151-13/+13
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-07-251-1/+1
|\
| * Merge branch 'master' into for-nextJiri Kosina2011-07-111-2/+2
| |\
| * | treewide: remove duplicate includesVitaliy Ivanov2011-06-202-2/+0Star
| * | treewide: Convert uses of struct resource to resource_size(ptr)Joe Perches2011-06-101-1/+1
* | | can: c_can: remove duplicated #includeHuang Weiyi2011-07-242-2/+0Star
* | | can: make function can_get_bittiming staticThadeu Lima de Souza Cascardo2011-07-221-1/+1
* | | slcan: remove unused 'leased', 'line' and 'pid' fields from the 'slcan' struc...Matvejchikov Ilya2011-07-201-9/+1Star
* | | net: can: remove custom hex_to_bin()Andy Shevchenko2011-07-181-21/+5Star
* | | slcan: remove obsolete code in slcan initialisationOliver Hartkopp2011-07-151-21/+6Star
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-07-061-2/+2
|\ \ \ | | |/ | |/|
| * | net/can: activate bit-timing calculation and netlink based drivers by defaultMarc Kleine-Budde2011-06-291-2/+2
| |/
* | can: remove useless defaults in KconfigKurt Van Dijck2011-07-011-3/+0Star
* | net: include io.h in sja1000_of_platform.c for iounmap etcStephen Rothwell2011-06-291-0/+1
* | can: bfin_can: auto-calculate accessor sizesMike Frysinger2011-06-281-59/+59
* | can: bfin_can: simplify xmit id1 setupMike Frysinger2011-06-281-15/+6Star
* | net: Remove unneeded version.h includes from drivers/net/Jesper Juhl2011-06-243-3/+0Star
* | net: remove mm.h inclusion from netdevice.hAlexey Dobriyan2011-06-223-0/+3
* | 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/+1Star
| * | 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-071-0/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-06-041-3/+2Star
|\
| * drivers/net/can/flexcan.c: add missing clk_putJulia Lawall2011-06-021-3/+2Star
* | Revert "tty: make receive_buf() return the amout of bytes received"Linus Torvalds2011-06-031-6/+3Star
* | mfd: Use mfd cell platform_data for janz cells platform bitsSamuel Ortiz2011-05-261-2/+1Star
* | 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-231-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/+33Star
| |\ \ \ | | | |/ | | |/|
| * | | treewide: remove extra semicolonsJustin P. Mattock2011-04-101-1/+1