summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-167-67/+88
|\
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville...David S. Miller2008-04-156-66/+84
| |\
| | * PS3: gelic: fix the oops on the broken IE returned from the hypervisorMasakazu Mokuno2008-04-151-3/+8
| | * b43legacy: fix DMA mapping leakageStefano Brivio2008-04-151-11/+18
| | * b43legacy: Fix usage of struct device used for DMAingMichael Buesch2008-04-151-13/+13
| | * ssb: Fix usage of struct device used for DMAingMichael Buesch2008-04-152-39/+40
| | * b43legacy: fix initvals loading on bcm4303Stefano Brivio2008-04-151-0/+2
| | * rtl8187: Add missing priv->vif assignmentsHerton Ronaldo Krzesinski2008-04-151-0/+3
| * | netconsole: only set CON_PRINTBUFFER if the user specifies a netconsoleMichael Ellerman2008-04-151-1/+4
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-1412-40/+138
|\|
| * net: check for underlength tap writesRusty Russell2008-04-121-1/+4
| * net: make struct tun_struct private to tun.cRusty Russell2008-04-121-0/+33
| * tg3: fix MMIO for PPC 44x platformsSergei Shtylyov2008-04-121-3/+4
| * Mark generic HDLC + PPP as broken.Krzysztof Halasa2008-04-121-1/+5
| * ehea: Fix DLPAR memory add supportThomas Klein2008-04-122-3/+24
| * sc92031: sysfs link missingStephen Hemminger2008-04-121-0/+1
| * smc91x driver: fix bug: print warning only in interrupt modeSonic Zhang2008-04-121-0/+2
| * forcedeth: mac address fixAyaz Abdulla2008-04-121-2/+24
| * macb: Use semicolon instead of comma for statementAtsushi Nemoto2008-04-121-6/+6
| * macb: Call phy_disconnect on removingAtsushi Nemoto2008-04-121-0/+2
| * ucc_geth: fix non-functional fixed phy supportJoakim Tjernlund2008-04-121-23/+30
| * fs_enet: Don't call NAPI functions when NAPI is not used.Laurent Pinchart2008-04-121-1/+2
| * sky2: missing chip name for Yukon SupremeStephen Hemminger2008-04-121-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-1111-118/+183
|\|
| * BNX2X: Correct bringing chip out of resetEliezer Tamir2008-04-091-3/+3
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-04-094-5/+3
| |\
| | * rt61pci: rt61pci_beacon_update do not free skb twiceDaniel Wagner2008-04-091-3/+1
| | * iwlwifi: fix n-band association problemAbhijeet Kolekar2008-04-071-1/+0
| | * ipw2200: set MAC address on radiotap interfaceDaniel Drake2008-04-071-0/+1
| | * libertas: fix mode initialization problemHolger Schurig2008-04-071-1/+1
| * | [NET]: Undo code bloat in hot paths due to print_mac().David S. Miller2008-04-087-110/+177
| |/
* | virtio_net: remove overzealous printkAnthony Liguori2008-04-071-1/+0
* | Revert "smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade"Linus Torvalds2008-04-071-4/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-075-22/+224
|\|
| * fix endian lossage in forcedethAl Viro2008-04-041-3/+2
| * net/tokenring/olympic.c section fixesAdrian Bunk2008-04-041-3/+3
| * net: marvell.c fix sparse shadowed variable warningHarvey Harrison2008-04-041-2/+0
| * [TG3]: Add PHY workaround for 5784Matt Carlson2008-04-032-14/+219
* | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/...Linus Torvalds2008-04-032-0/+2
|\ \ | |/ |/|
| * [POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet worksRené Bürgel2008-04-032-0/+2
* | sky2: fix suspend/resume racesStephen Hemminger2008-04-021-0/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-0217-30/+52
|\ \
| * | b43: Fix PCMCIA IRQ routingMichael Buesch2008-04-011-2/+4
| * | b43: Add DMA mapping failure messagesMichael Buesch2008-04-011-1/+6
| * | Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/...David S. Miller2008-03-2810-21/+28
| |\ \
| | * | forcedeth: fix locking bug with netconsoleIngo Molnar2008-03-281-8/+10
| | * | usb net: asix does not really need 10/100mbitMike Frysinger2008-03-281-1/+1
| | * | Blackfin EMAC Driver: delete unused variables to fixup gcc warningsMike Frysinger2008-03-281-2/+0
| | * | ibm_newemac: emac_tx_csum typo fixValentine Barshak2008-03-281-2/+2
| | * | Make pasemi_mac.c depend on PPC_PASEMI to prevent link errorsMichael Ellerman2008-03-281-1/+1