David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

2009-12-05 15:22:26 -08:00

..

hostap_80211_rx.c

hostap: convert to internal net_device_stats

2009-03-21 22:55:34 -07:00

hostap_80211_tx.c

wireless: convert drivers to netdev_tx_t

2009-09-01 01:14:04 -07:00

hostap_80211.h

wireless: convert drivers to netdev_tx_t

2009-09-01 01:14:04 -07:00

hostap_ap.c

hostap: convert to internal net_device_stats

2009-03-21 22:55:34 -07:00

hostap_ap.h

hostap: convert usage of net/ieee80211.h to linux/ieee80211.h

2009-02-27 14:51:41 -05:00

hostap_common.h

wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts

2008-10-31 19:00:50 -04:00

hostap_config.h

[PATCH] hostap: Remove driver version number

2007-07-08 22:16:38 -04:00

hostap_cs.c

pcmcia: rework the irq_req_t typedef

2009-11-28 18:03:14 +01:00

hostap_download.c

hostap annotations

2008-01-28 15:09:05 -08:00

hostap_hw.c

net: remove needless (now buggy) & from dev->dev_addr

2009-05-17 11:59:47 -07:00

hostap_info.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

hostap_ioctl.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

hostap_main.c

hostap: Revert a toxic part of the conversion to net_device_ops

2009-09-14 14:36:03 -04:00

hostap_pci.c

pci: use pci_ioremap_bar() in drivers/net

2008-10-31 00:53:48 -04:00

hostap_plx.c

wireless: remove some (bogus?) 'may be used uninitialized' warnings

2009-04-24 15:41:41 -04:00

hostap_proc.c

lib80211: absorb crypto bits from net/ieee80211

2008-11-21 11:08:17 -05:00

hostap_wlan.h

hostap: convert to internal net_device_stats

2009-03-21 22:55:34 -07:00

hostap.h

hostap: convert usage of net/ieee80211.h to linux/ieee80211.h

2009-02-27 14:51:41 -05:00

Kconfig

wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig

2009-10-30 16:50:35 -04:00

Makefile

[PATCH] hostap: don't #include C files in hostap_main.c

2006-01-16 16:51:54 -05:00