summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jg...Linus Torvalds2007-10-2310-36/+15
|\
| * [SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriateJeff Garzik2007-10-232-4/+2
| * [NETDRVR] lib82596, netxen: delete pointless tests from irq handlerJeff Garzik2007-10-232-16/+3
| * Eliminate pointless casts from void* in a few driver irq handlers.Jeff Garzik2007-10-233-4/+4
| * [PARPORT] Remove unused 'irq' argument from parport irq functionsJeff Garzik2007-10-233-12/+6
* | Merge branch 'warnings' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...Linus Torvalds2007-10-232-3/+1
|\ \
| * | ni5010: kill unused variableJeff Garzik2007-10-231-2/+0
| * | eexpress: fix !SMP unused-var warningJeff Garzik2007-10-231-1/+1
| |/
* | bonding: Acquire correct locks in alb for promisc changeJay Vosburgh2007-10-231-9/+10
* | bonding: Convert more locks to _bh, acquire rtnl, for new lockingJay Vosburgh2007-10-233-23/+29
* | bonding: Convert locks to _bh, rework alb locking for new lockingJay Vosburgh2007-10-232-30/+117
* | bonding: Convert miimon to new lockingJay Vosburgh2007-10-231-19/+51
* | bonding: Convert balance-rr transmit to new lockingJay Vosburgh2007-10-232-13/+13
* | Convert bonding timers to workqueuesJay Vosburgh2007-10-237-122/+117
* | pasemi_mac: fix typoOlof Johansson2007-10-231-1/+1
* | defxx.c: dfx_bus_init() is __devexit not __devinitMaciej W. Rozycki2007-10-231-1/+1
* | sky2: crash on removeStephen Hemminger2007-10-231-2/+2
* | MIPSnet: Delete all the useless debugging printks.Ralf Baechle2007-10-231-40/+4
* | AR7 ethernet: small post-merge cleanups and fixesMatteo Croce2007-10-231-19/+12
* | Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth in...Jeff Garzik2007-10-233-512/+677
|\ \
| * | mv643xx_eth: Remove obsolete checksum offload commentDale Farnsworth2007-10-231-3/+0
| * | mv643xx_eth: Merge drivers/net/mv643xx_eth.h into mv643xx_eth.cLennert Buytenhek2007-10-232-568/+557
| * | mv643xx_eth: Remove unused register definesLennert Buytenhek2007-10-231-87/+0
| * | mv643xx_eth: Clean up mv643xx_eth.hLennert Buytenhek2007-10-231-283/+250
| * | mv643xx_eth: Remove MV643XX_ETH_ register prefixLennert Buytenhek2007-10-232-410/+397
| * | mv643xx_eth: Remove SHARED_REGS register address biasLennert Buytenhek2007-10-232-125/+117
| * | mv643xx_eth: Enable use on Orion platformsLennert Buytenhek2007-10-232-6/+9
| * | mv643xx_eth: Disable RX/TX byte swapping on little-endian systemsLennert Buytenhek2007-10-231-0/+11
| * | mv643xx_eth: Move ethernet register definitions into private headerLennert Buytenhek2007-10-231-1/+307
* | | Merge branch 'bug-fixes' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth i...Jeff Garzik2007-10-231-0/+1
|\ \ \
| * | | mv643xx_eth: Hook up mv643xx_get_sset_countDale Farnsworth2007-10-231-0/+1
| |/ /
* | | Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git...Jeff Garzik2007-10-231-141/+265
|\ \ \ | |_|/ |/| |
| * | r8169: more phy init for the 8168Francois Romieu2007-10-181-0/+34
| * | r8169: update the phy init for the 8168CFrancois Romieu2007-10-181-0/+2
| * | r8169: phy init cleanupFrancois Romieu2007-10-181-7/+11
| * | r8169: phy init for the 8168Francois Romieu2007-10-181-0/+52
| * | r8169: make room for more phy init changesFrancois Romieu2007-10-181-25/+31
| * | r8169: remove dead woodFrancois Romieu2007-10-181-64/+2
| * | r8169: add MAC identifiersFrancois Romieu2007-10-181-23/+64
| * | r8169: use the existing symbolic name of vendor PCI ID 0x1259Francois Romieu2007-10-181-1/+1
| * | r8169: remove private net_device_stats structureFrancois Romieu2007-10-181-17/+17
| * | r8169: MSI supportFrancois Romieu2007-10-181-6/+44
| * | r8169: convert bitfield to plain enum maskFrancois Romieu2007-10-181-3/+11
| * | r8169: KERN_XXX vs PFX (trivial)Joe Perches2007-10-181-2/+2
| * | r8169: add KERN_DEBUG to dprintk (trivial)Joe Perches2007-10-181-2/+3
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2007-10-231-1/+1
|\ \ \
| * | | mlx4_core: Increase command timeout for INIT_HCA to 10 secondsJack Morgenstein2007-10-211-1/+1
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguestLinus Torvalds2007-10-234-556/+442
|\ \ \ \
| * | | | Remove old lguest bus and drivers.Rusty Russell2007-10-232-551/+0
| * | | | Net driver using virtioRusty Russell2007-10-233-0/+442
OpenPOWER on IntegriCloud