David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

2009-06-15 03:02:23 -07:00

..

hostap_80211_rx.c

hostap: convert to internal net_device_stats

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

hostap_80211_tx.c

net: use symbolic values for ndo_start_xmit() return codes

2009-06-13 01:18:50 -07:00

hostap_80211.h

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

2009-02-27 14:51:41 -05: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: remove unused argument to pcmcia_parse_tuple()

2008-08-31 15:50:33 +02: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

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

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

hostap_ioctl.c

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

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

hostap_main.c

hostap: convert to net_device_ops

2009-03-21 22:55:36 -07: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

trivial: Kconfig: .ko is normally not included in module names

2009-06-12 18:01:50 +02:00

Makefile

…