David S. Miller da8120355e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/wireless/orinoco/main.c

2009-07-16 20:21:24 -07:00

..

airport.c

orinoco: Handle suspend/restore in core driver

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

cfg.c

orinoco: convert scanning to cfg80211

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

cfg.h

orinoco: initiate cfg80211 conversion

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

fw.c

orinoco: firmware helpers should use dev_err and friends

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

fw.h

…

hermes_dld.c

orinoco: make firmware download less verbose

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

hermes_dld.h

…

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

orinoco: convert scanning to cfg80211

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

hw.h

orinoco: convert scanning to cfg80211

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

Kconfig

orinoco: initiate cfg80211 conversion

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

main.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-07-16 20:21:24 -07:00

main.h

orinoco: provide generic commit function

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

Makefile

orinoco: initiate cfg80211 conversion

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

mic.c

…

mic.h

…

orinoco_cs.c

orinoco: Handle suspend/restore in core driver

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

orinoco_nortel.c

orinoco: move netdev interface creation to main driver

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

orinoco_pci.c

orinoco: move netdev interface creation to main driver

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

orinoco_pci.h

orinoco: Handle suspend/restore in core driver

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

orinoco_plx.c

orinoco: move netdev interface creation to main driver

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

orinoco_tmd.c

orinoco: move netdev interface creation to main driver

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

orinoco.h

orinoco: convert scanning to cfg80211

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

scan.c

orinoco: fix printk format specifier for size_t arguments

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

scan.h

orinoco: convert scanning to cfg80211

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

spectrum_cs.c

orinoco: Handle suspend/restore in core driver

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

wext.c

orinoco: remove WE nickname support

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

wext.h

…