Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually		2008-10-13 14:12:40 -07:00
..
appletalk
arcnet	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
arm
atl1e	atl1e: remove the unneeded (struct atl1e_adapter *)	2008-09-24 20:49:05 -04:00
atlx	atl1: update introductory comments	2008-10-08 16:09:24 -07:00
bonding	drivers/net/bonding: sparse fixes for exported tables	2008-09-24 22:12:57 -04:00
can
chelsio
cris
cxgb3	cxgb3: Add 1G fiber support	2008-10-08 17:40:28 -07:00
e1000	e1000: allow VLAN devices to use TSO and CSUM offload	2008-10-11 12:25:59 -07:00
e1000e	e1000e: don't generate bad checksums for tcp packets with 0 csum	2008-10-09 14:28:58 -07:00
ehea	Revert "ehea: fix mutex and spinlock use"	2008-09-25 13:06:59 -07:00
enic	enic: Attempt to fix build in 32-bit such as i386.	2008-10-09 22:13:53 -07:00
fs_enet	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
hamradio
ibm_newemac	ibm_newemac: Fix EMAC soft reset on 460EX/GT	2008-10-08 15:27:14 -07:00
igb	igb: clean up a stray fake netdev code left in rx path	2008-09-03 10:08:17 -04:00
irda	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
ixgb	ixgb: fix bug when freeing resources	2008-10-08 16:53:40 -07:00
ixgbe	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
ixp2000
mlx4	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-01 06:12:56 -07:00
myri10ge	myri10ge: update driver version number to 1.4.3-1.369	2008-10-10 14:33:37 -07:00
netxen	netxen: enable msi-x for quad-gig boards	2008-09-24 18:59:01 -04:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
phy	phylib: two dynamic mii_bus allocation fallout fixes	2008-10-09 09:45:04 -07:00
qlge	qlge: remove duplicated #include	2008-10-12 21:04:10 -07:00
sfc	sfc: Fix type of FALCON_SPI_MAX_LEN	2008-09-24 18:54:42 -04:00
skfp	drivers/net/skfp/pmf.c: Use offsetof() macro	2008-09-24 18:48:56 -04:00
tokenring	[netdrvr] removed unused #include <version.h>	2008-09-03 10:24:22 -04:00
tulip	tulip: Fix dead 21041 ethernet after ifconfig down	2008-09-24 18:48:52 -04:00
usb	smsc95xx: fix usb usage on big endian platforms	2008-10-09 14:34:47 -07:00
wan	tty: kref the tty driver object	2008-10-13 09:51:42 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
3c59x.c
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c
7990.h
8139cp.c	8139cp: use netdev_alloc_skb	2008-09-03 10:24:09 -04:00
8139too.c	8139too: move wmb before TX DMA start	2008-10-08 17:12:57 -07:00
8390.c
8390.h
8390p.c
82596.c
a2065.c
a2065.h
ac3200.c
acenic_firmware.h
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	net/au1000_eth.c MDIO namespace fixes	2008-10-12 21:02:19 -07:00
au1000_eth.h	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
ax88796.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
b44.c
b44.h
bfin_mac.c	net/bfin_mac.c MDIO namespace fixes	2008-10-12 21:15:17 -07:00
bfin_mac.h	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
bmac.c
bmac.h
bnx2_fw2.h
bnx2_fw.h	bnx2: Update 5706/5708 firmware.	2008-10-09 12:22:38 -07:00
bnx2.c	bnx2: Update version to 1.8.1.	2008-10-09 12:27:06 -07:00
bnx2.h	bnx2: Handle DMA mapping errors.	2008-10-09 12:26:41 -07:00
bnx2x_fw_defs.h
bnx2x_hsi.h
bnx2x_init_values.h
bnx2x_init.h
bnx2x_link.c
bnx2x_link.h
bnx2x_main.c	bnx2x: EEH recovery fix	2008-09-09 05:07:25 -07:00
bnx2x_reg.h
bnx2x.h	bnx2x: Accessing un-mapped page	2008-09-03 14:38:00 -07:00
bsd_comp.c
cassini.c	cassini: use request_firmware	2008-09-22 19:27:10 -07:00
cassini.h	cassini: use request_firmware	2008-09-22 19:27:10 -07:00
cpmac.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
cs89x0.c	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
cs89x0.h
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.h
dummy.c
e100.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-01 06:12:56 -07:00
e2100.c
eepro100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
epic100.c
eql.c
es3210.c
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c	netdev: uniquify the tx_timeout name	2008-10-08 17:09:54 -07:00
fec_mpc52xx_phy.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
fec_mpc52xx.c
fec_mpc52xx.h
fec.c
fec.h
forcedeth.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-01 06:12:56 -07:00
gianfar_ethtool.c
gianfar_mii.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
gianfar_mii.h
gianfar_sysfs.c
gianfar.c	gianfar: Create net device with carrier down	2008-10-08 17:03:12 -07:00
gianfar.h
hamachi.c
hp100.c
hp100.h
hp-plus.c	hpplus: fix build regression	2008-09-16 19:35:05 -07:00
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
iseries_veth.c
jazzsonic.c
jme.c	jme: remove unused #include <version.h>	2008-10-12 21:08:58 -07:00
jme.h	jme: Advances version number	2008-10-08 19:51:33 -07:00
Kconfig	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
korina.c
lance.c
lasi_82596.c
lib8390.c	lib8390: Fix locking in ei_poll (poll controller)	2008-10-08 16:56:48 -07:00
lib82596.c
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
macb.h	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c
Makefile	qlge: New Qlogic 10Gb Ethernet Driver.	2008-09-18 11:56:28 -04:00
meth.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
meth.h
mii.c
mipsnet.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
mv643xx_eth.c	mv643xx_eth: include linux/ip.h to fix build	2008-10-08 17:01:31 -07:00
mvme147.c
myri_code.h
myri_sbus.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
myri_sbus.h
natsemi.c	netdev: uniquify the tx_timeout name	2008-10-08 17:09:54 -07:00
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c	ne.c: fix rmmod, platform driver improvements	2008-09-24 20:49:00 -04:00
netconsole.c
netx-eth.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-09-16 14:11:43 -07:00
niu.h
ns83820.c
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
pcnet32.c
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c	ppp: Use skb_queue_walk() in ppp_mp_insert().	2008-10-09 16:40:29 -07:00
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppol2tp.c	net: Remove __skb_insert() calls outside of skbuff internals.	2008-09-21 21:28:51 -07:00
pppox.c
ps3_gelic_net.c
ps3_gelic_net.h
ps3_gelic_wireless.c
ps3_gelic_wireless.h
qla3xxx.c
qla3xxx.h
r6040.c	r6040: fix wrong assignment in r6040_free_txbufs	2008-09-24 20:48:08 -04:00
r8169.c	r8169: NULL pointer dereference on r8169 load	2008-10-12 20:58:29 -07:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
s2io.h	s2io: Fix enabling VLAN tag stripping at driver initialization	2008-09-24 18:49:04 -04:00
sb1000.c
sb1250-mac.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
sh_eth.h
sis190.c
sis900.c
sis900.h
skge.c	skge: Fix skge_set_ring_param() losing error return	2008-10-08 16:02:40 -07:00
skge.h
sky2.c	sky2: Fix WOL regression	2008-10-12 20:59:48 -07:00
sky2.h
slhc.c
slip.c
slip.h
smc91x.c	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
smc91x.h	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
smc911x.c	smc911x: Add support for LAN921{5,7,8} chips from SMSC	2008-10-12 21:05:14 -07:00
smc911x.h	smc911x: Add support for LAN921{5,7,8} chips from SMSC	2008-10-12 21:05:14 -07:00
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire_firmware.h
starfire_firmware.pl
starfire.c
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
sunbmac.h
sundance.c	sundance: set carrier status on link change events	2008-09-24 18:59:01 -04:00
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c	net/tc35815.c: fix compilation	2008-10-12 21:01:53 -07:00
tehuti_fw.h
tehuti.c
tehuti.h	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
tg3.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
tg3.h	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
tlan.c
tlan.h
tsi108_eth.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
tsi108_eth.h
tun.c
typhoon-firmware.h
typhoon.c
typhoon.h
ucc_geth_ethtool.c
ucc_geth_mii.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
ucc_geth_mii.h
ucc_geth.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
ucc_geth.h
veth.c
via-rhine.c	via-rhine: changed to use netdev_alloc_skb() from dev_alloc_skb	2008-09-03 10:24:04 -04:00
via-velocity.c	via-velocity: Fix warnings on sparc64.	2008-10-08 15:55:15 -07:00
via-velocity.h	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
virtio_net.c
wd.c
xen-netfront.c
yellowfin.c
znet.c
zorro8390.c