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

Conflicts:
	drivers/net/yellowfin.c

2009-09-02 00:32:56 -07:00

..

airport.c

…

cfg.c

…

cfg.h

…

fw.c

orinoco: firmware helpers should use dev_err and friends

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

fw.h

…

hermes_dld.c

…

hermes_dld.h

…

hermes_rid.h

…

hermes.c

…

hermes.h

…

hw.c

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

2009-09-02 00:32:56 -07:00

hw.h

orinoco: add function to retrieve current bssid

2009-08-14 09:12:44 -04:00

Kconfig

…

main.c

wireless: convert drivers to netdev_tx_t

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

main.h

…

Makefile

…

mic.c

orinoco: Move MIC helpers into new file

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

mic.h

…

orinoco_cs.c

…

orinoco_nortel.c

…

orinoco_pci.c

…

orinoco_pci.h

orinoco: Handle suspend/restore in core driver

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

orinoco_plx.c

…

orinoco_tmd.c

…

orinoco.h

orinoco: consolidate storage of WEP and TKIP keys

2009-08-14 09:12:45 -04:00

scan.c

orinoco: fix printk format specifier for size_t arguments

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

scan.h

…

spectrum_cs.c

…

wext.c

orinoco: remove spare whitespace

2009-08-20 11:36:07 -04:00

wext.h

…