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
..
ath5k	ath5k: implement multi-rate retry support, fix tx status reporting	2008-10-06 18:14:57 -04:00
ath9k	ath9k: Fix return code when ath9k_hw_setpower() fails on reset	2008-10-10 12:26:24 -07:00
b43	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
b43legacy	mac80211: add multi-rate retry support	2008-10-06 18:14:57 -04:00
hostap	pcmcia: remove unused argument to pcmcia_parse_tuple()	2008-08-31 15:50:33 +02:00
iwlwifi	iwlwifi: remove STATUS_CONF_PENDING in scanning	2008-10-06 18:14:58 -04:00
libertas	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
libertas_tf	mac80211: use nl80211 interface types	2008-09-15 16:48:23 -04:00
p54	p54: report appropriate rate and band values for 802.11a	2008-10-06 18:14:56 -04:00
prism54
rt2x00	mac80211: free up 2 bytes in skb->cb	2008-10-06 18:14:57 -04:00
zd1211rw	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-01 06:12:56 -07:00
adm8211.c	mac80211: use nl80211 interface types	2008-09-15 16:48:23 -04:00
adm8211.h
airo.c	wireless: Read scan flags correctly on x86-64	2008-09-24 16:17:58 -04:00
airo.h
airo_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
airport.c
arlan-main.c
arlan-proc.c
arlan.h
atmel.c	wireless: Read scan flags correctly on x86-64	2008-09-24 16:17:58 -04:00
atmel.h
atmel_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
atmel_pci.c
hermes.c
hermes.h
hermes_dld.c
hermes_dld.h
hermes_rid.h
i82586.h
i82593.h
ipw2100.c
ipw2100.h
ipw2200.c
ipw2200.h
Kconfig
mac80211_hwsim.c	mac80211 hwsim: make radio list dynamic	2008-09-15 16:48:25 -04:00
Makefile
netwave_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
orinoco.c	wireless: Read scan flags correctly on x86-64	2008-09-24 16:17:58 -04:00
orinoco.h
orinoco_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
orinoco_nortel.c
orinoco_pci.c
orinoco_pci.h
orinoco_plx.c
orinoco_tmd.c
ray_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
ray_cs.h
rayctl.h
rndis_wlan.c	wireless: Read scan flags correctly on x86-64	2008-09-24 16:17:58 -04:00
rtl818x.h
rtl8180.h
rtl8180_dev.c	mac80211: add multi-rate retry support	2008-10-06 18:14:57 -04:00
rtl8180_grf5101.c
rtl8180_grf5101.h
rtl8180_max2820.c
rtl8180_max2820.h
rtl8180_rtl8225.c
rtl8180_rtl8225.h
rtl8180_sa2400.c
rtl8180_sa2400.h
rtl8187.h
rtl8187_dev.c	mac80211: use nl80211 interface types	2008-09-15 16:48:23 -04:00
rtl8187_rtl8225.c
rtl8187_rtl8225.h
spectrum_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
strip.c
wavelan.c
wavelan.h
wavelan.p.h
wavelan_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
wavelan_cs.h
wavelan_cs.p.h
wl3501.h
wl3501_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
zd1201.c
zd1201.h