summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...Linus Torvalds2007-05-102-16/+16
|\
| * Merge branch 'linux-2.6'Paul Mackerras2007-05-1078-177/+19732
| |\
| * | [POWERPC] Change rheap functions to use ulongs instead of pointersTimur Tabi2007-05-092-16/+16
* | | [S390] Kconfig: no wireless on s390.Martin Schwidefsky2007-05-101-0/+1
* | | [S390] Kconfig: unwanted menus for s390.Martin Schwidefsky2007-05-101-0/+1
| |/ |/|
* | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan...Linus Torvalds2007-05-0922-0/+6439
|\ \
| * | IB/mlx4: Add a driver Mellanox ConnectX InfiniBand adaptersRoland Dreier2007-05-0822-0/+6439
| |/
* | Merge branch 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...Linus Torvalds2007-05-0922-0/+13226
|\ \
| * | Move USB network drivers to drivers/net/usb.Jeff Garzik2007-05-0922-0/+13226
* | | atl1: add netconsole supportAlexey Dobriyan2007-05-091-0/+12
* | | Fix hang on IBM Token Ring PCMCIA card ejectionPaul Walmsley2007-05-091-5/+9
* | | skge: default WOL should be magic only (rev2)Stephen Hemminger2007-05-091-1/+3
* | | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Jeff Garzik2007-05-095-118/+8
|\ \ \ | |/ / |/| |
| * | [PATCH] bcm43xx: Remove dead configuration variable CONFIG_947XXLarry Finger2007-05-084-118/+4
| * | [PATCH] zd1211rw: Add ID for ZyXEL AG-225H v2Daniel Drake2007-05-081-0/+1
| * | [PATCH] zd1211rw: Add ID for Sitecom WL-117Matthew Davidson2007-05-081-0/+2
| * | [PATCH] zd1211rw: Added new USB id for Planex GW-US54ZGLUlrich Kunitz2007-05-081-0/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2007-05-0924-38/+29
|\ \ \
| * | | remove broken URLs from net drivers' outputMarkus Dahms2007-05-099-22/+13
| * | | Fix occurrences of "the the "Michael Opdenacker2007-05-099-9/+9
| * | | Fix "deprecated" typoes.Robert P. J. Day2007-05-092-2/+2
| * | | Fix misspellings collected by members of KJ list.Robert P. J. Day2007-05-094-5/+5
| | |/ | |/|
* | | unify flush_work/flush_work_keventd and rename it to cancel_work_syncOleg Nesterov2007-05-093-4/+4
* | | phy: use flush_work_keventd()Andrew Morton2007-05-091-3/+3
* | | e1000: use flush_work_keventd()Andrew Morton2007-05-091-1/+1
* | | tg3: use flush_work_keventd()Andrew Morton2007-05-092-11/+2
|/ /
* | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-05-0821-385/+893
|\ \
| * | [netdrvr] atl1: fix buildJeff Garzik2007-05-081-0/+1
| * | pasemi_mac: Use local-mac-address instead of mac-address if availableOlof Johansson2007-05-081-1/+6
| * | pasemi_mac: PHY supportOlof Johansson2007-05-083-0/+133
| * | pasemi_mac: Add msglevel support and "debug" module paramOlof Johansson2007-05-082-4/+23
| * | pasemi_mac: Logic cleanup / rx performance improvementsOlof Johansson2007-05-081-38/+37
| * | pasemi_mac: Minor cleanup / define fixesOlof Johansson2007-05-082-10/+8
| * | pasemi_mac: Add SKB reuse / copy-breakOlof Johansson2007-05-081-7/+24
| * | pasemi_mac: Timer and interrupt fixesOlof Johansson2007-05-082-12/+30
| * | pasemi_mac: Abstract and fix up interrupt restart routinesOlof Johansson2007-05-081-3/+41
| * | pasemi_mac: Move the IRQ mapping from the PCI layer to the driverOlof Johansson2007-05-082-9/+23
| * | tc35815: Remove unnecessary skb->dev assignmentAtsushi Nemoto2007-05-081-1/+0
| * | drivers/net/dm9000: Convert to generic booleanRichard Knutsson2007-05-081-7/+4
| * | AT91RM9200 Ethernet: Fix multicast addressingAndrew Victor2007-05-081-2/+2
| * | AT91RM9200 Ethernet: Support additional PHYsAndrew Victor2007-05-082-21/+73
| * | PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast codeKomuro2007-05-081-6/+8
| * | sky2: re-enable 88E8056 for most motherboardsStephen Hemminger2007-05-081-4/+13
| * | ne: MIPS: Use platform_driver for ne on RBTX49XXAtsushi Nemoto2007-05-082-9/+1
| * | ne: Add NEEDS_PORTLIST to control ISA auto-probeAtsushi Nemoto2007-05-081-3/+8
| * | ne: Misc fixes for platform driver.Atsushi Nemoto2007-05-081-6/+7
| * | ne: Add platform_driverAtsushi Nemoto2007-05-081-2/+89
| * | libertas: fix for wireless Kconfig changesJohn W. Linville2007-05-081-1/+1
| * | atl1: fix whitespace damageJay Cliburn2007-05-081-11/+11
| * | atl1: use dev_printk macrosJay Cliburn2007-05-084-87/+68