summaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-271-2/+5
|\
| * net: 3c574_cs fix stats.tx_bytes counterAlexander Kurz2010-04-221-2/+5
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-141-7/+6Star
|\|
| * smc91c92_cs: define multicast_table as unsigned charKen Kawasaki2010-04-131-7/+6Star
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-112-2/+0Star
|\|
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-04-061-5/+7
| |\
| * | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-302-2/+0Star
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-072-6/+9
|\ \ \ | | |/ | |/|
| * | smc91c92_cs: fix the problem of "Unable to find hardware address"Ken Kawasaki2010-04-041-5/+7
| |/
| * pcnet_cs: add new idKen Kawasaki2010-03-281-1/+2
* | net: convert multicast list to list_headJiri Pirko2010-04-035-16/+16
* | net/pcmcia/3c589_cs: using netdev_info and friends where appropriateAlexander Kurz2010-04-021-139/+147
|/
* Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2010-03-011-4/+2Star
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-02-281-4/+2Star
| |\
| | * pcmcia: remove remaining unused IRQ_FIRST_SHARED parameterDominik Brodowski2010-01-171-4/+2Star
* | | axnet_cs: add new idKen Kawasaki2010-02-281-0/+1
* | | net/pcmcia: convert to use netdev_for_each_mc_addrJiri Pirko2010-02-195-69/+67Star
* | | net: use netdev_mc_count and netdev_mc_empty when appropriateJiri Pirko2010-02-126-18/+18
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-01-281-0/+1
|\| |
| * | fmvj18x_cs: add new id (Panasonic lan & modem card)Ken Kawasaki2010-01-231-0/+1
| |/
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-01-132-3/+2Star
| |\
* | \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-01-112-3/+2Star
|\ \ \ | | |/ | |/|
| * | pcmcia: ncmlan_cs: remove odd bracketAlexander Beregalov2010-01-071-1/+0Star
| * | pcnet_cs: add cis of KTI PE520 pcmcia network cardKen Kawasaki2010-01-071-2/+2
* | | axnet_cs: remove unnecessary spin_unlock_irqrestoreKen Kawasaki2010-01-041-3/+0Star
| |/ |/|
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-12-162-0/+8
|\|
| * 3c574_cs: disable irq before calling el3_interruptKen Kawasaki2009-12-142-0/+8
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2009-12-145-5/+5
|\ \ | |/ |/|
| * pcmcia: remove unused IRQ_FIRST_SHAREDDominik Brodowski2009-12-075-5/+5
* | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2009-12-0610-878/+545Star
|\|
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2009-12-0510-878/+545Star
| |\
| | * pcmcia: rework the irq_req_t typedefDominik Brodowski2009-11-2810-32/+20Star
| | * pcmcia: remove deprecated handle_to_dev() macroDominik Brodowski2009-11-2810-10/+10
| | * pcmcia: pcmcia_request_window() doesn't need a pointer to a pointerDominik Brodowski2009-11-285-8/+8
| | * pcmcia: Change window_handle_t logic to unsigned longMagnus Damm2009-11-281-1/+1
| | * pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()Magnus Damm2009-11-285-8/+8
| | * pcmcia: Pass struct pcmcia_device to pcmcia_release_window()Magnus Damm2009-11-283-5/+5
| | * pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (net)Dominik Brodowski2009-11-0910-506/+315Star
| | * pcmcia: convert net pcmcia drivers to use new CIS helpersDominik Brodowski2009-11-086-322/+171Star
| | * pcmcia: use pcmcia_loop_config in misc pcmcia driversDominik Brodowski2009-11-081-7/+15
| | * pcmcia: use pre-determined valuesDominik Brodowski2009-11-082-5/+18
* | | drivers/net: Move && and || to end of previous lineJoe Perches2009-12-035-26/+26
* | | drivers/net: remove exceptional & on function nameJulia Lawall2009-11-182-2/+2
* | | pcnet-cs: declare MODULE_FIRMWAREBen Hutchings2009-11-111-0/+7
|/ /
* / pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia cardKen Kawasaki2009-10-301-1/+1
|/
* 3c574_cs: spin_lock the set_multicast_list functionKen Kawasaki2009-10-131-1/+12
* pcnet_cs: add cis of National Semicondoctor's multifunction pcmcia cardKen Kawasaki2009-10-051-5/+5
* pcmcia: pcnet_cs.c removing useless conditionJaswinder Singh Rajput2009-09-221-6/+5Star
* pcnet_cs: add cis of Linksys multifunction pcmcia cardKen Kawasaki2009-09-151-5/+5
* netdev: Convert MDIO ioctl implementation to use struct mii_ioctl_dataBen Hutchings2009-09-044-18/+26