John W. Linville 3b51cc996e Merge branch 'master' into for-davem ...

Conflicts:
	drivers/net/wireless/ath/ath9k/phy.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-debugfs.c

2010-04-23 14:43:45 -04:00

..

airport.c

orinoco: Handle suspend/restore in core driver

2009-07-10 15:01:46 -04:00

cfg.c

orinoco: implement set_wiphy_params

2010-04-19 16:41:42 -04:00

cfg.h

orinoco: initiate cfg80211 conversion

2009-07-10 15:01:44 -04:00

fw.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

fw.h

orinoco: firmware: consistently compile out fw cache support if not requested

2009-03-16 18:09:26 -04:00

hermes_dld.c

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-11 17:12:17 -08:00

hermes_dld.h

orinoco: prevent accessing memory outside the firmware image

2009-02-27 14:53:02 -05:00

hermes_rid.h

…

hermes.c

wireless: remove redundant tests on unsigned

2009-07-10 15:01:57 -04:00

hermes.h

orinoco: convert scanning to cfg80211

2009-07-10 15:01:46 -04:00

hw.c

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

hw.h

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

Kconfig

orinoco: disable support for prism chipset by default

2010-03-15 15:32:06 -04:00

main.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

main.h

orinoco: use cfg80211_find_ie

2010-04-19 16:41:42 -04:00

Makefile

orinoco: have sparse check endian issues

2010-04-19 16:41:42 -04:00

mic.c

orinoco: Move MIC helpers into new file

2009-02-13 13:44:13 -05:00

mic.h

orinoco: Move MIC helpers into new file

2009-02-13 13:44:13 -05:00

orinoco_cs.c

orinoco: disable support for prism chipset by default

2010-03-15 15:32:06 -04:00

orinoco_nortel.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

orinoco_pci.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

orinoco_pci.h

orinoco: Handle suspend/restore in core driver

2009-07-10 15:01:46 -04:00

orinoco_plx.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

orinoco_tmd.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

orinoco.h

orinoco: implement set_wiphy_params

2010-04-19 16:41:42 -04:00

scan.c

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

scan.h

orinoco: convert scanning to cfg80211

2009-07-10 15:01:46 -04:00

spectrum_cs.c

pcmcia: rework the irq_req_t typedef

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

wext.c

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

wext.h

orinoco: Move WEXT handlers into a separate file

2009-02-13 13:44:33 -05:00