aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm
Commit message (Expand)AuthorAgeFilesLines
* remove firmware files, merge more uncritical stuff from 3.0.101Wolfgang Wiedmeyer2015-10-231-0/+5
* Merge remote-tracking branch 'kernelorg/linux-3.0.y' into 3_0_64Andrew Dodd2013-02-272-76/+79
|\
| * atm/iphase: rename fregt_t -> ffreg_tHeiko Carstens2013-02-141-73/+73
| * solos-pci: fix double-free of TX skb in DMA modeDavid Woodhouse2013-01-111-2/+3
| * solos-pci: Fix DMA supportDavid Woodhouse2012-06-101-1/+3
* | samsung update 1codeworkx2012-06-021-5/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-205-68/+10
|\
| * atm: solos-pci: Fix set-but-unused variable.David S. Miller2011-04-171-2/+1
| * atm: idt77252: Fix set-but-unused variables.David S. Miller2011-04-171-48/+4
| * atm: he: Fix undefined sequence points.David S. Miller2011-04-171-2/+2
| * atm: eni: Kill set-but-unused variables.David S. Miller2011-04-171-5/+0
| * atm: iphase: Fix set-but-not-used warnings.David S. Miller2011-04-121-11/+3
* | drivercore: revert addition of of_match to struct deviceGrant Likely2011-05-181-2/+5
|/
* Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6Linus Torvalds2011-04-078-16/+16
|\
| * Fix common misspellingsLucas De Marchi2011-03-318-16/+16
* | atm/solos-pci: Don't flap VCs when carrier state changesPhilip A. Prindeville2011-03-301-25/+1
* | atm/solos-pci: Don't include frame pseudo-header on transmit hex-dumpPhilip A. Prindeville2011-03-301-1/+8
* | atm/solos-pci: Use VPI.VCI notation uniformly.Philip A. Prindeville2011-03-301-2/+2
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-03-181-1/+1
|\
| * Merge branch 'master' into for-nextJiri Kosina2011-02-151-1/+1
| |\
| * | fix typos 'comamnd' -> 'command' in commentsJustin P. Mattock2011-02-021-1/+1
* | | dt: Eliminate of_platform_{,un}register_driverGrant Likely2011-02-281-7/+10
* | | ATM, Solos PCI ADSL2+: Don't deref NULL pointer if net_ratelimit() and alloc_...Jesper Juhl2011-02-131-2/+3
| |/ |/|
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2011-01-242-3/+3
|\ \ | |/
| * Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-132-3/+3
| |\
| | * Merge branch 'master' into for-nextJiri Kosina2010-12-2215-23/+36
| | |\
| | * | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-012-3/+3
* | | | atm: idt77105: fix fetch_stats() resultVasiliy Kulikov2011-01-211-1/+1
|/ / /
* | | Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init(...Jesper Juhl2011-01-091-7/+12
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-01-041-1/+4
|\ \ \
| * | | drivers/atm/atmtcp.c: add missing atm_dev_putJulia Lawall2010-12-311-1/+4
| | |/ | |/|
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-12-1714-23/+27
|\ \ \ | |/ /
| * | atm: correct sysfs 'device' link creation and parent relationshipsDan Williams2010-12-1014-23/+27
* | | atm: lanai: use kernel's '%pM' format option to print MACAndy Shevchenko2010-12-081-5/+2
* | | atm: fore200e: Fix build warning.David S. Miller2010-11-181-1/+1
|/ /
* | solos: Refuse to upgrade firmware with older FPGA. It doesn't work.David Woodhouse2010-11-081-0/+8
* | solos: Add 'Firmware' attribute for Traverse overall firmware versionDavid Woodhouse2010-11-081-0/+1
|/
* drivers/atm/eni.c: Remove multiple uses of KERN_<level>Joe Perches2010-10-261-3/+4
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-241-1/+1
|\
| * Update broken web addresses in the kernel.Justin P. Mattock2010-10-181-1/+1
* | Drivers: atm: Makefile: replace the use of <module>-objs with <module>-yTracey Dent2010-10-211-1/+1
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-10-113-10/+6
|\ \
| * | ATM: iphase, remove sleep-inside-atomicJiri Slaby2010-10-112-7/+1
| * | ATM: solos-pci, remove use after freeJiri Slaby2010-10-111-3/+5
* | | drivers/atm/idt77252.c: Remove unnecessary error checkJulia Lawall2010-10-031-4/+2
* | | drivers: atm: use native kernel's hex_to_bin() funcAndy Shevchenko2010-09-211-4/+2
* | | drivers/atm/firestream.c: Fix unsigned return typeJulia Lawall2010-09-061-2/+2
* | | drivers/atm: Adjust confusing if indentationJulia Lawall2010-08-161-1/+1
|/ /
* | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-121-13/+13
|\ \ | |/ |/|
| * of/device: Replace struct of_device with struct platform_deviceGrant Likely2010-08-061-13/+13