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-2556-709/+1575
|\
| * Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/...David S. Miller2008-04-2553-668/+1231
| |\
| | * [netdrvr] tehuti: move ioctl perm check closer to function startJeff Garzik2008-04-251-2/+3
| | * via-velocity: fix vlan receiptFrancois Romieu2008-04-251-18/+28
| | * forcedeth: realtek phy crossover detectionAyaz Abdulla2008-04-251-42/+178
| | * ibm_newemac: Increase MDIO timeoutsBenjamin Herrenschmidt2008-04-251-4/+4
| | * gianfar: Fix skb allocation strategyAndy Fleming2008-04-251-35/+65
| | * netxen: reduce stack usage of netxen_nic_flash_printHarvey Harrison2008-04-251-7/+8
| | * smc911x: test after postfix decrement fails in smc911x_{reset,drop_pkt}Roel Kluin2008-04-251-3/+3
| | * net drivers: fix platform driver hotplug/coldplugKay Sievers2008-04-2520-5/+44
| | * forcedeth: new backoff implementationAyaz Abdulla2008-04-251-34/+178
| | * ehea: make things staticAndrew Morton2008-04-251-2/+2
| | * phylib: Add support for board-level PHY fixupsAndy Fleming2008-04-253-13/+123
| | * [netdrvr] atlx: code movement: move atl1 parameter parsingChris Snook2008-04-252-138/+138
| | * atlx: remove flash vendor parameterChris Snook2008-04-251-39/+0
| | * korina: misc cleanupFrancois Romieu2008-04-251-19/+16
| | * korina: fix misplaced return statementFrancois Romieu2008-04-251-2/+2
| | * WAN: Fix confusing insmod error code for C101 too.Krzysztof Halasa2008-04-251-3/+3
| | * Removing dead code in drivers/net/wan/hdlc_fr.cCédric Augonnet2008-04-251-4/+0
| | * tehuti: check register sizeFrancois Romieu2008-04-251-0/+14
| | * [netdrvr] typhoon: typhoon_resume - remove call to start_queueGrant Grundler2008-04-251-1/+0
| | * ibm_newemac: PowerPC 440EP/440GR EMAC PHY clock workaroundValentine Barshak2008-04-252-2/+47
| | * ibm_newemac: PowerPC 440GX EMAC PHY clock workaroundValentine Barshak2008-04-252-3/+23
| | * ibm_newemac Use status property for unused/unwired EMACsJosh Boyer2008-04-251-2/+5
| | * ibm_newemac: Fix section mismatch warningsJosh Boyer2008-04-255-6/+6
| | * ibm_newemac: Add support for 460EX/GT-type MAL rx-channel handlingStefan Roese2008-04-251-0/+16
| | * ibm_newemac: Fix problem with jumbo frame support and EMAC V4.patchStefan Roese2008-04-251-1/+4
| | * e1000e: Increment version to 0.2.1Jesse Brandeburg2008-04-251-1/+1
| | * igb: save and restore pcie/msi state to support EEH recoveryAuke Kok2008-04-251-0/+2
| | * e1000e: save and restore pcie/msi state to support EEH recoveryWendy Xiong2008-04-251-0/+2
| | * ixgbe: save and restore pcie/msi state to support EEH recoveryWendy Xiong2008-04-251-0/+2
| | * e1000e: lower ring minimum size to 64Auke Kok2008-04-251-2/+2
| | * e1000e: Fix HW Error on es2lan, ARP capture issue by BMCDavid Graham2008-04-254-66/+137
| | * e1000e: Add interrupt moderation run-time ethtool interfaceAuke Kok2008-04-252-0/+46
| | * e1000e: cleanup several stats issuesBruce Allan2008-04-257-86/+122
| | * S2io: Removed rx_lock and put_lockSreenivasa Honnur2008-04-252-35/+2
| | * S2io: Removed receive buffer replenishment taskletSreenivasa Honnur2008-04-252-92/+4
| | * S2io: Version update for memory leak fix during free_tx_buffersSreenivasa Honnur2008-04-251-1/+1
| | * S2io: Fix memory leak during free_tx_buffersSreenivasa Honnur2008-04-251-1/+1
| | * ucc_geth: Fix sneaky merge conflict regarding bus_idAndy Fleming2008-04-251-1/+1
| * | tg3: sparse cleanupEric Dumazet2008-04-241-0/+2
| * | niu: Add support for Neptune FEM/NEM cards for C10 server bladesMatheos Worku2008-04-242-30/+277
| * | niu: Determine the # of ports from the card's VPD dataMatheos Worku2008-04-242-11/+65
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/coo...Linus Torvalds2008-04-241-1/+1
|\ \
| * | [Blackfin] arch: finish removing remnants of old BF537_PORT_H option of Black...Mike Frysinger2008-04-241-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-2411-55/+121
|\ \ \ | |/ / |/| / | |/
| * tun: Multicast handling in tun_chr_ioctl() needs proper locking.David S. Miller2008-04-241-0/+10
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville...David S. Miller2008-04-238-22/+82
| |\
| | * iwlwifi: Don't unlock priv->mutex if it isn't lockedRoland Dreier2008-04-232-2/+0
| | * wireless: rndis_wlan: modparam_workaround_interval is never below 0.Roel Kluin2008-04-231-2/+3