kernel-fxtec-pro1x/drivers/net/wireless/orinoco
David S. Miller f11c179eea Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/wireless/orinoco/orinoco.c
2009-02-25 00:02:05 -08:00
..
airport.c orinoco: Rename orinoco.c 2009-02-11 11:44:27 -05:00
fw.c orinoco: Storage class should be before const qualifier 2009-02-13 13:45:14 -05:00
fw.h orinoco: Move firmware handling into a separate file 2009-02-13 13:44:26 -05:00
hermes.c orinoco: hermes doesn't need to be a separate module 2009-02-13 13:44:37 -05:00
hermes.h orinoco: checkpatch cleanup 2009-02-09 15:03:32 -05:00
hermes_dld.c orinoco: hermes_dld does not need to be a module 2009-02-13 13:44:35 -05:00
hermes_dld.h
hermes_rid.h
hw.c orinoco: Move hardware functions into separate file 2009-02-13 13:44:31 -05:00
hw.h orinoco: Move hardware functions into separate file 2009-02-13 13:44:31 -05:00
Kconfig Move orinoco Kconfig entries into drivers/net/wireless/orinoco/Kconfig 2009-01-29 16:00:44 -05:00
main.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-02-25 00:02:05 -08:00
main.h orinoco: Move WEXT handlers into a separate file 2009-02-13 13:44:33 -05:00
Makefile orinoco: hermes doesn't need to be a separate module 2009-02-13 13:44:37 -05: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.h orinoco: checkpatch cleanup 2009-02-09 15:03:32 -05:00
orinoco_cs.c orinoco: Rename orinoco.c 2009-02-11 11:44:27 -05:00
orinoco_nortel.c orinoco: checkpatch cleanup 2009-02-09 15:03:32 -05:00
orinoco_pci.c orinoco: checkpatch cleanup 2009-02-09 15:03:32 -05:00
orinoco_pci.h orinoco: Rename orinoco.c 2009-02-11 11:44:27 -05:00
orinoco_plx.c orinoco: checkpatch cleanup 2009-02-09 15:03:32 -05:00
orinoco_tmd.c orinoco: Rename orinoco.c 2009-02-11 11:44:27 -05:00
scan.c orinoco: Move scan helpers to a separate file 2009-02-11 11:44:28 -05:00
scan.h orinoco: Move scan helpers to a separate file 2009-02-11 11:44:28 -05:00
spectrum_cs.c orinoco: Rename orinoco.c 2009-02-11 11:44:27 -05:00
wext.c orinoco: Move WEXT handlers into a separate file 2009-02-13 13:44:33 -05:00
wext.h orinoco: Move WEXT handlers into a separate file 2009-02-13 13:44:33 -05:00