openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
6bd4bcd3cd8affc09eaee7efbc037f65f4a71501
linux-st/drivers/net
History
David S. Miller 74d154189d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c
2009-07-23 19:03:51 -07:00
..
appletalk
…
arcnet
…
arm
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
atl1c
atl1c: misplaced parenthesis
2009-07-16 18:05:20 -07:00
atl1e
…
atlx
atlx: duplicate testing of MCAST flag
2009-07-13 11:02:55 -07:00
benet
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
bonding
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
can
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
chelsio
…
cris
…
cxgb3
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-09 20:18:24 -07:00
e1000
…
e1000e
…
ehea
netdev: restore MTU change operation
2009-07-12 14:20:04 -07:00
enic
…
fs_enet
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
hamradio
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
ibm_newemac
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
igb
igb: gcc-3.4.6 fix
2009-07-13 11:11:41 -07:00
igbvf
…
irda
…
ixgb
…
ixgbe
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
ixp2000
…
mlx4
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
myri10ge
…
netxen
netxen: fix thermal check and shutdown
2009-07-20 08:23:33 -07:00
pcmcia
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
phy
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
qlge
…
sfc
…
skfp
…
tokenring
…
tulip
…
usb
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
vxge
…
wan
…
wimax
…
wireless
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
3c59x.c
…
3c501.c
…
3c501.h
…
3c503.c
…
3c503.h
…
3c505.c
…
3c505.h
…
3c507.c
…
3c509.c
…
3c515.c
…
3c523.c
…
3c523.h
…
3c527.c
…
3c527.h
…
7990.c
…
7990.h
…
8139cp.c
…
8139too.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
8390.c
…
8390.h
…
8390p.c
…
82596.c
…
a2065.c
…
a2065.h
…
ac3200.c
…
acenic.c
…
acenic.h
…
amd8111e.c
…
amd8111e.h
…
apne.c
…
ariadne.c
…
ariadne.h
…
at1700.c
…
atarilance.c
…
atp.c
…
atp.h
…
au1000_eth.c
…
au1000_eth.h
…
ax88796.c
…
b44.c
b44: strncpy does not null terminate string
2009-07-20 08:02:58 -07:00
b44.h
…
bfin_mac.c
…
bfin_mac.h
…
bmac.c
…
bmac.h
…
bnx2_fw.h
…
bnx2.c
…
bnx2.h
…
bnx2x_dump.h
…
bnx2x_fw_defs.h
…
bnx2x_fw_file_hdr.h
…
bnx2x_hsi.h
bnx2x: Supporting BCM8727 PHY
2009-07-21 11:18:30 -07:00
bnx2x_init_ops.h
…
bnx2x_init.h
…
bnx2x_link.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
bnx2x_link.h
bnx2x: Supporting BCM8727 PHY
2009-07-21 11:18:30 -07:00
bnx2x_main.c
bnx2x: Version 1.48.113-1
2009-07-21 11:18:32 -07:00
bnx2x_reg.h
bnx2x: Supporting BCM8727 PHY
2009-07-21 11:18:30 -07:00
bnx2x.h
bnx2x: Missing parenthesis might result with wrong casting
2009-07-21 11:18:31 -07:00
bsd_comp.c
…
cassini.c
…
cassini.h
…
cnic_defs.h
…
cnic_if.h
…
cnic.c
…
cnic.h
…
cpmac.c
…
cs89x0.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
cs89x0.h
…
davinci_emac.c
…
de600.c
…
de600.h
…
de620.c
…
de620.h
…
declance.c
…
defxx.c
…
defxx.h
…
depca.c
…
depca.h
…
dl2k.c
…
dl2k.h
…
dm9000.c
dm9000: switch to dev_pm_ops
2009-07-23 18:01:01 -07:00
dm9000.h
…
dnet.c
…
dnet.h
…
dummy.c
…
e100.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
e2100.c
…
eepro.c
…
eexpress.c
…
eexpress.h
…
enc28j60_hw.h
…
enc28j60.c
…
epic100.c
…
eql.c
…
es3210.c
…
eth16i.c
…
ethoc.c
…
ewrk3.c
…
ewrk3.h
…
fealnx.c
…
fec_mpc52xx_phy.c
…
fec_mpc52xx.c
…
fec_mpc52xx.h
…
fec.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
fec.h
…
forcedeth.c
…
fsl_pq_mdio.c
…
fsl_pq_mdio.h
…
gianfar_ethtool.c
…
gianfar_sysfs.c
…
gianfar.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
gianfar.h
…
hamachi.c
…
hp100.c
…
hp100.h
…
hp-plus.c
…
hp.c
…
hplance.c
…
hplance.h
…
hydra.c
…
ibmlana.c
…
ibmlana.h
…
ibmveth.c
…
ibmveth.h
…
ifb.c
…
ioc3-eth.c
…
ipg.c
…
ipg.h
…
isa-skeleton.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
iseries_veth.c
…
jazzsonic.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
jme.c
…
jme.h
…
Kconfig
net: KS8851 needs to depend on MII
2009-07-22 09:33:08 -07:00
korina.c
…
ks8842.c
…
ks8851.c
net: Micrel KS8851 SPI network driver
2009-07-20 08:23:26 -07:00
ks8851.h
net: Micrel KS8851 SPI network driver
2009-07-20 08:23:26 -07:00
lance.c
…
lasi_82596.c
…
lib8390.c
…
lib82596.c
…
LICENSE.SRC
…
ll_temac_main.c
…
ll_temac_mdio.c
…
ll_temac.h
…
lne390.c
…
loopback.c
…
lp486e.c
…
mac89x0.c
…
mac8390.c
…
macb.c
…
macb.h
…
mace.c
…
mace.h
…
macmace.c
…
macsonic.c
net: move macsonic's probe function to .devinit.text
2009-07-23 18:01:09 -07:00
macvlan.c
…
Makefile
net: Micrel KS8851 SPI network driver
2009-07-20 08:23:26 -07:00
mdio.c
…
meth.c
net: move meth's probe function to .devinit.text
2009-07-23 18:01:06 -07:00
meth.h
…
mii.c
…
mipsnet.c
…
mv643xx_eth.c
…
mvme147.c
…
myri_sbus.c
…
myri_sbus.h
…
natsemi.c
…
ne2.c
…
ne2k-pci.c
…
ne3210.c
…
ne-h8300.c
…
ne.c
…
netconsole.c
…
netx-eth.c
…
ni52.c
…
ni52.h
…
ni65.c
…
ni65.h
…
ni5010.c
…
ni5010.h
…
niu.c
…
niu.h
…
ns83820.c
…
pasemi_mac_ethtool.c
…
pasemi_mac.c
…
pasemi_mac.h
…
pci-skeleton.c
…
pcnet32.c
…
plip.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
ppp_async.c
Revert "NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines."
2009-07-14 13:13:41 -07:00
ppp_deflate.c
…
ppp_generic.c
…
ppp_mppe.c
…
ppp_mppe.h
…
ppp_synctty.c
Revert "NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines."
2009-07-14 13:13:41 -07:00
pppoe.c
…
pppol2tp.c
…
pppox.c
…
ps3_gelic_net.c
netdev: restore MAC address set and validate operations
2009-07-12 14:20:02 -07:00
ps3_gelic_net.h
…
ps3_gelic_wireless.c
netdev: restore MAC address set and validate operations
2009-07-12 14:20:02 -07:00
ps3_gelic_wireless.h
…
qla3xxx.c
…
qla3xxx.h
…
r6040.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-09 20:18:24 -07:00
r8169.c
…
rionet.c
…
rrunner.c
…
rrunner.h
…
s2io-regs.h
…
s2io.c
…
s2io.h
…
s6gmac.c
…
sb1000.c
…
sb1250-mac.c
net: move sb1250-mac's probe function to .devinit.text
2009-07-23 18:01:07 -07:00
sc92031.c
New device ID for sc92031 [1088:2031]
2009-07-20 08:27:02 -07:00
seeq8005.c
…
seeq8005.h
…
sgiseeq.c
net: move sgiseeq's probe function to .devinit.text
2009-07-23 18:01:04 -07:00
sgiseeq.h
…
sh_eth.c
…
sh_eth.h
…
sis190.c
…
sis900.c
…
sis900.h
…
skge.c
skge: Enable WoL by default if supported
2009-07-22 11:24:26 -07:00
skge.h
…
sky2.c
sky2: Avoid races in sky2_down
2009-07-21 20:57:56 -07:00
sky2.h
…
slhc.c
…
slip.c
…
slip.h
…
smc91x.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
smc91x.h
…
smc911x.c
…
smc911x.h
…
smc9194.c
…
smc9194.h
…
smc-mca.c
…
smc-ultra32.c
…
smc-ultra.c
…
smsc911x.c
netdev: restore MTU change operation
2009-07-12 14:20:04 -07:00
smsc911x.h
…
smsc9420.c
…
smsc9420.h
…
sni_82596.c
…
sonic.c
…
sonic.h
…
Space.c
…
spider_net_ethtool.c
…
spider_net.c
…
spider_net.h
…
starfire.c
…
stnic.c
…
sun3_82586.c
…
sun3_82586.h
…
sun3lance.c
…
sunbmac.c
…
sunbmac.h
…
sundance.c
…
sungem_phy.c
…
sungem_phy.h
…
sungem.c
…
sungem.h
…
sunhme.c
…
sunhme.h
…
sunlance.c
…
sunqe.c
…
sunqe.h
…
sunvnet.c
netdev: restore MTU change operation
2009-07-12 14:20:04 -07:00
sunvnet.h
…
tc35815.c
…
tehuti.c
…
tehuti.h
…
tg3.c
…
tg3.h
…
tlan.c
…
tlan.h
…
tsi108_eth.c
…
tsi108_eth.h
…
tun.c
tun: Allow tap device to send/receive UFO packets.
2009-07-17 10:11:00 -07:00
typhoon.c
…
typhoon.h
…
ucc_geth_ethtool.c
…
ucc_geth.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-23 19:03:51 -07:00
ucc_geth.h
…
veth.c
veth: Zero timestamp in xmit path.
2009-07-23 18:01:02 -07:00
via-rhine.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-16 20:21:24 -07:00
via-velocity.c
Remove unnecessary forward declarations from velocity NIC driver.
2009-07-23 18:11:12 -07:00
via-velocity.h
Fix typos in comments in via-velocity header.
2009-07-23 18:11:28 -07:00
virtio_net.c
virtio-net: Allow UFO feature to be set and advertised.
2009-07-17 10:10:58 -07:00
wd.c
…
xen-netfront.c
…
xtsonic.c
net: move xtsonic's probe function to .devinit.text
2009-07-23 18:01:08 -07:00
yellowfin.c
…
znet.c
…
zorro8390.c
…