summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/netdev-jwlJeff Garzik2005-11-187-774/+784
|\
| * [PATCH] hostap: rename hostap.c to hostap_main.cAdrian Bunk2005-11-162-0/+1
| * [PATCH] atmel: audit return code of create_proc_read_entryChristophe Lucas2005-11-161-1/+4
| * [PATCH] atmel: CodingStyle cleanupCarlo Perassi2005-11-161-728/+759
| * [PATCH] Remove drivers/net/wan/lmc/lmc_prot.hTobias Klauser2005-11-161-15/+0
| * [PATCH] skge: fix warning from inlining SkPciWriteCfgDWord()John W. Linville2005-11-161-1/+0
| * [PATCH] drivers/net/sk98lin/skge.c: make SkPciWriteCfgDWord() a static inlineAdrian Bunk2005-11-162-30/+21
* | Merge branch 'master'Jeff Garzik2005-11-182-3/+6
|\ \
| * | [PATCH] ipw2200: fix error log offset calculationZhu Yi2005-11-171-2/+1
| * | [PATCH] ipw2200: disallow direct scanning when device is downPekka Enberg2005-11-171-0/+4
| * | [PATCH] sdladrv.c build fixToni Mueller2005-11-151-1/+1
* | | Merge branch 'master'Jeff Garzik2005-11-1510-19/+24
|\| |
| * | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-11-131-8/+8
| |\ \
| | * | [ARM] Use correct IO operations for PlebRussell King2005-11-121-8/+8
| | |/
| * | [PATCH] ppc: add support for new powerbooksOlof Johansson2005-11-131-0/+2
| * | [PATCH] Update email address for KumarKumar Gala2005-11-135-5/+5
| * | [PATCH] move pm_register/etc. to CONFIG_PM_LEGACY, pm_legacy.hJeff Garzik2005-11-133-6/+9
| |/
* | Merge branch 'bonding-sysfs' of git://git.tuxdriver.com/git/netdev-jwlJeff Garzik2005-11-156-180/+1731
|\ \
| * | [PATCH] bonding: comments and changelogMitch Williams2005-11-132-0/+26
| * | [PATCH] bonding: spelling and whitespace correctionsMitch Williams2005-11-133-3/+4
| * | [PATCH] bonding: version updateMitch Williams2005-11-131-2/+2
| * | [PATCH] bonding: add sysfs functionality to bonding (large)Mitch Williams2005-11-134-2/+1429
| * | [PATCH] bonding: add ARP entries to /procMitch Williams2005-11-131-0/+23
| * | [PATCH] bonding: Allow ARP target table to have empty entriesMitch Williams2005-11-131-1/+3
| * | [PATCH] bonding: make bond_init not __initMitch Williams2005-11-131-1/+1
| * | [PATCH] bonding: move bond creation into separate functionMitch Williams2005-11-132-52/+62
| * | [PATCH] bonding: make functions not staticMitch Williams2005-11-132-13/+24
| * | [PATCH] bonding: expose some structsMitch Williams2005-11-132-8/+10
| * | [PATCH] bonding: explicitly clear RLB flag during ALB initMitch Williams2005-11-131-0/+2
| * | [PATCH] bonding: move kmalloc out of spinlock in ALB initMitch Williams2005-11-131-10/+12
| * | [PATCH] bonding: get slave name from actual slave instead of param listMitch Williams2005-11-131-2/+2
| * | [PATCH] bonding: Add transmit policy to /procMitch Williams2005-11-131-0/+7
| * | [PATCH] bonding: expand module param descriptionsMitch Williams2005-11-131-5/+12
| * | [PATCH] bonding: add bond name to all error messagesMitch Williams2005-11-133-81/+112
| |/
* | Merge branch 'sky2'Jeff Garzik2005-11-114-1/+4969
|\ \
| * | [PATCH] sky2 needs dma_mapping.hAndrew Morton2005-11-111-0/+1
| * | Merge branch 'master'Jeff Garzik2005-11-1191-5493/+12458
| |\ \
| * \ \ Merge branch 'master'Jeff Garzik2005-11-05105-3738/+10496
| |\ \ \
| * | | | [PATCH] sky2: version 0.7shemminger@osdl.org2005-10-281-1/+1
| * | | | [PATCH] sky2: fix NAPI and receive handlingshemminger@osdl.org2005-10-281-33/+30
| * | | | [PATCH] sky2: spelling fixesshemminger@osdl.org2005-10-282-21/+21
| * | | | [PATCH] sky2: use kzallocshemminger@osdl.org2005-10-281-3/+2
| * | | | [PATCH] sky2: remove unused definitionsshemminger@osdl.org2005-10-281-32/+4
| * | | | Merge branch 'master'Jeff Garzik2005-10-28142-4570/+15776
| |\ \ \ \
| * | | | | [PATCH] sky2: add permanent address support.Stephen Hemminger2005-10-041-0/+2
| * | | | | [PATCH] sky2: nway reset (BONUS FEATURE)Stephen Hemminger2005-09-281-0/+19
| * | | | | [PATCH] sky2: version 0.6shemminger@osdl.org2005-09-281-5/+3
| * | | | | [PATCH] sky2: explicit set power stateshemminger@osdl.org2005-09-282-45/+112
| * | | | | [PATCH] sky2: add hardware VLAN acceleration supportshemminger@osdl.org2005-09-282-14/+93
| * | | | | [PATCH] sky2: cleanup interrupt processingshemminger@osdl.org2005-09-281-37/+28