Linus Torvalds 1685e633b3 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: pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq pcmcia: do not request windows if you don't need to pcmcia: insert PCMCIA device resources into resource tree pcmcia: export resource information to sysfs pcmcia: use struct resource for PCMCIA devices, part 2 pcmcia: remove memreq_t pcmcia: move local definitions out of include/pcmcia/cs.h pcmcia: do not use io_req_t when calling pcmcia_request_io() pcmcia: do not use io_req_t after call to pcmcia_request_io() pcmcia: use struct resource for PCMCIA devices pcmcia: clean up cs.h pcmcia: use pcmica_{read,write}_config_byte pcmcia: remove cs_types.h pcmcia: remove unused flag, simplify headers pcmcia: remove obsolete CS_EVENT_ definitions pcmcia: split up central event handler pcmcia: simplify event callback pcmcia: remove obsolete ioctl Conflicts in: - drivers/staging/comedi/drivers/* - drivers/staging/wlags49_h2/wl_cs.c due to dev_info_t and whitespace changes		2010-08-06 12:25:06 -07:00
..
appletalk
arcnet	arcnet: fix signed bug in probe function	2010-07-18 15:07:15 -07:00
arm	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
atl1c
atl1e
atlx
benet	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
bnx2x	net: bnx2x_cmn.c needs net/ip6_checksum.h for csum_ipv6_magic	2010-07-28 22:20:34 -07:00
bonding	bonding: prevent sysfs from allowing arp monitoring with alb/tlb	2010-07-30 23:27:57 -07:00
caif	caif: handle snprintf() return	2010-07-26 21:05:03 -07:00
can	can: Add driver for esd CAN-USB/2 device	2010-08-03 16:37:58 -07:00
chelsio
cris	eth_v10: Removing dead ETRAX_NETWORK_RED_ON_NO_CONNECTION	2010-07-14 13:41:53 -07:00
cxgb3	drivers/net/cxgb3/t3_hw.c: use new hex_to_bin() method	2010-07-21 11:16:09 -07:00
cxgb4	cxgb4: update driver version	2010-08-02 16:26:44 -07:00
cxgb4vf	cxgb4vf: Fix bug where we were only allocating one queue in MSI mode	2010-07-20 12:42:43 -07:00
e1000	e1000: use netif_<level> instead of netdev_<level>	2010-07-26 23:37:21 -07:00
e1000e	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-08-06 11:44:36 -07:00
ehea
enic
fs_enet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
hamradio
ibm_newemac	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
igb	igb: Program MDICNFG register prior to PHY init	2010-08-03 16:40:53 -07:00
igbvf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
irda	drivers/net/irda: use for_each_pci_dev()	2010-07-21 14:44:28 -07:00
ixgb
ixgbe	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-27 21:01:35 -07:00
ixgbevf	ixgbevf: fix null pointer dereference due to filter being set for VLAN 0	2010-08-02 21:20:21 -07:00
ixp2000
mlx4	drivers/net/mlx4: Use %pV, pr_<level>, printk_once	2010-07-15 19:05:17 -07:00
myri10ge
netxen	netxen: fix for kdump	2010-07-14 17:55:35 -07:00
octeon	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
phy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
qlcnic	qlcnic: fix diag resource allocation	2010-07-25 16:32:41 -07:00
qlge	drivers/net/qlge: Use pr_<level>, shrink text a bit	2010-07-21 14:44:18 -07:00
sfc	sfc: Remove unused field left from mis-merge	2010-07-08 23:12:29 -07:00
skfp
stmmac	stmmac: fix automatic PAD/FCS stripping	2010-07-27 20:43:50 -07:00
tokenring
tulip	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
usb	hso: Add new product ID	2010-08-03 16:40:52 -07:00
vmxnet3	net-next: Fix an overflow bug in vmxnet3 Tx descriptor	2010-07-25 17:06:52 -07:00
vxge	drivers/net/vxge/vxge-main.c: Use pr_<level> and netdev_<level>	2010-07-30 23:27:57 -07:00
wan	drivers/net/wan/farsync.c: Use standard pr_<level>	2010-08-02 16:01:35 -07:00
wimax	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
3c59x.c	3c59x: Add ethtool WOL support	2010-07-25 16:48:44 -07:00
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
8390.c
8390.h
8390p.c
82596.c	drivers/net/82596.c: fix warning	2010-07-19 15:27:13 -07:00
a2065.c
a2065.h
ac3200.c	ac3200: fix error path	2010-07-11 18:15:08 -07:00
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c	at1700: fix double free_irq	2010-07-11 18:15:08 -07:00
atarilance.c
atp.c
atp.h
au1000_eth.c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus	2010-08-05 08:53:20 -07:00
au1000_eth.h
ax88796.c	ax88796: free irq on error	2010-07-08 23:42:40 -07:00
b44.c	b44: remove unused dma_desc_align_mask	2010-07-07 18:24:29 -07:00
b44.h
bcm63xx_enet.c	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
bcm63xx_enet.h
bfin_mac.c
bfin_mac.h
bmac.c
bmac.h
bnx2_fw.h
bnx2.c	bnx2: Update version to 2.0.17.	2010-07-19 20:30:07 -07:00
bnx2.h	bnx2: Call pci_enable_msix() with actual number of vectors.	2010-07-19 20:30:06 -07:00
bsd_comp.c
cassini.c	cassini: Removing dead CASSINI_NAPI	2010-07-14 13:36:18 -07:00
cassini.h	cassini: Removing dead CASSINI_QGE_DEBUG	2010-07-14 12:18:31 -07:00
cnic_defs.h
cnic_if.h
cnic.c	bnx2x: Create separate folder for bnx2x driver	2010-07-27 20:35:39 -07:00
cnic.h
cpmac.c	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
cs89x0.c	net: Removing dead ARCH_PNX010X	2010-07-19 13:32:57 -07:00
cs89x0.h	cs89x0: Removing dead SH_HICOSH4	2010-07-14 13:40:36 -07:00
davinci_emac.c	net: Fix a typo from "dev" to "ndev"	2010-08-02 22:03:03 -07:00
de600.c
de600.h
de620.c
de620.h
declance.c	NET: declance: Fix section mismatches	2010-07-26 19:08:14 +01:00
defxx.c
defxx.h
depca.c	depca: fix leaks in depca_module_init()	2010-07-12 20:21:40 -07:00
depca.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h
dnet.c	dnet: fixup error handling in initialization	2010-07-30 23:27:58 -07:00
dnet.h
dummy.c
e100.c
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c	epic100: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:14 -07:00
eql.c
es3210.c
eth16i.c	eth16i: fix memory leak	2010-07-14 17:57:19 -07:00
ethoc.c	ethoc: add devinit/devexit section initializers	2010-07-26 18:45:05 -07:00
ewrk3.c
ewrk3.h
fealnx.c	fealnx: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:13 -07:00
fec_mpc52xx_phy.c
fec_mpc52xx.c	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
fec_mpc52xx.h
fec.c	net/fec: restore interrupt mask after software-reset in fec_stop()	2010-07-22 14:14:46 -07:00
fec.h
forcedeth.c	forcedeth: Fix different hardware statistics versions.	2010-07-25 21:54:28 -07:00
fsl_pq_mdio.c	of/address: Clean up function declarations	2010-08-01 01:42:42 -06:00
fsl_pq_mdio.h
gianfar_ethtool.c
gianfar_sysfs.c
gianfar.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
gianfar.h
greth.c
greth.h
hamachi.c	hamachi: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:15 -07:00
hp100.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	ibmveth: lost IRQ while closing/opening device leads to service loss	2010-07-16 13:03:23 -07:00
ibmveth.h
ifb.c
ioc3-eth.c	ioc3-eth: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:12 -07:00
ipg.c
ipg.h
iseries_veth.c
jazzsonic.c	jazzsonic: free irq if sonic_open() fails	2010-07-12 20:21:44 -07:00
jme.c
jme.h
Kconfig	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-08-05 09:03:46 -07:00
korina.c
ks8842.c	ks8842: Fix warnings on 64-bit.	2010-07-27 22:24:37 -07:00
ks8851_mll.c
ks8851.c
ks8851.h
ksz884x.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
lance.c	lance: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:16 -07:00
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
ll_temac_main.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c	net: fix 64 bit counters on 32 bit arches	2010-07-07 14:58:56 -07:00
lp486e.c
mac89x0.c	mac89x0: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:18 -07:00
mac8390.c
macb.c	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
macb.h
mace.c
mace.h
macmace.c
macsonic.c	macsonic: free irqs if sonic_open() fails	2010-07-12 20:21:44 -07:00
macvlan.c	macvlan: Fix rx counters update in macvlan_handle_frame()	2010-07-27 21:02:42 -07:00
macvtap.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-27 21:01:35 -07:00
Makefile	bnx2x: Create separate folder for bnx2x driver	2010-07-27 20:35:39 -07:00
mdio.c
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	mv643xx_eth: potential null dereference	2010-07-23 13:05:12 -07:00
mvme147.c
myri_sbus.c	of/platform: remove all of_bus_type and of_platform_bus_type references	2010-07-24 09:57:52 -06:00
myri_sbus.h
natsemi.c	natsemi: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:17 -07:00
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c	net/ne: fix memory leak in ne_drv_probe()	2010-07-05 20:08:05 -07:00
netconsole.c
netx-eth.c
ni52.c	ni52: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:19 -07:00
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
niu.h
ns83820.c	ns83820: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:18 -07:00
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c	net: autoconvert trivial BKL users to private mutex	2010-07-12 20:21:47 -07:00
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppox.c
ps3_gelic_net.c
ps3_gelic_net.h
ps3_gelic_wireless.c
ps3_gelic_wireless.h
qla3xxx.c	drivers/net/qla3xxx.c: Checkpatch cleanups	2010-07-26 13:15:21 -07:00
qla3xxx.h
r6040.c	r6040: Fix args to phy_mii_ioctl().	2010-07-21 21:10:49 -07:00
r8169.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-08-06 11:44:36 -07:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h	vxge: Update copyright information	2010-07-15 20:46:22 -07:00
s2io.c	net: s2io: fix buffer overflow	2010-07-23 13:05:13 -07:00
s2io.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-27 21:01:35 -07:00
s6gmac.c
sb1000.c
sb1250-mac.c	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
sh_eth.h
sis190.c
sis900.c
sis900.h
skge.c
skge.h
sky2.c	sky2: Code style fixes	2010-07-30 23:59:04 -07:00
sky2.h
slhc.c
slip.c
slip.h
smc91x.c
smc91x.h	Remove REDWOOD_[456] config options and conditional code	2010-07-26 09:06:04 -04:00
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c	smsc911x: Add spinlocks around registers access	2010-07-19 13:36:21 -07:00
smsc911x.h
smsc9420.c	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c	net: Removing dead {AR,WAVE}LAN	2010-07-14 12:17:35 -07:00
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c	starfire: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:15 -07:00
stnic.c
sun3_82586.c	sun3_82586: Use the instance of net_device_stats from net_device.	2010-07-05 19:41:11 -07:00
sun3_82586.h
sun3lance.c
sunbmac.c	of/platform: remove all of_bus_type and of_platform_bus_type references	2010-07-24 09:57:52 -06:00
sunbmac.h
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c	of/platform: remove all of_bus_type and of_platform_bus_type references	2010-07-24 09:57:52 -06:00
sunhme.h
sunlance.c	of/platform: remove all of_bus_type and of_platform_bus_type references	2010-07-24 09:57:52 -06:00
sunqe.c	of/platform: remove all of_bus_type and of_platform_bus_type references	2010-07-24 09:57:52 -06:00
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
tehuti.c
tehuti.h
tg3.c	tg3: Update version to 3.113	2010-08-02 15:46:33 -07:00
tg3.h	tg3: Migrate tg3_flags to phy_flags	2010-08-02 15:46:33 -07:00
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c	tun: keep link (carrier) state up to date	2010-07-30 22:06:41 -07:00
typhoon.c
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c	ucc_geth: fix UCC device number in debug message	2010-07-30 22:08:50 -07:00
ucc_geth.h
veth.c
via-rhine.c
via-velocity.c
via-velocity.h
virtio_net.c	virtio_net: fix oom handling on tx	2010-07-02 22:27:26 -07:00
wd.c	wd: fix memory leak	2010-07-14 17:53:18 -07:00
xen-netfront.c
xilinx_emaclite.c	of/address: Clean up function declarations	2010-08-01 01:42:42 -06:00
xtsonic.c	xtsonic: free irq if sonic_open() fails	2010-07-12 20:21:45 -07:00
yellowfin.c
znet.c
zorro8390.c