kernel-fxtec-pro1x/drivers/net/wireless/orinoco
Linus Torvalds 1685e633b3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes
2010-08-06 12:25:06 -07:00
..
airport.c powerpc/macio: Fix probing of macio devices by using the right of match table 2010-06-02 17:50:38 +10:00
cfg.c drivers/net/wireless: Use wiphy_<level> 2010-07-27 15:14:13 -04:00
cfg.h
fw.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
fw.h
hermes.c orinoco_usb: implement fw download 2010-05-03 14:53:09 -04:00
hermes.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
hermes_dld.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2010-06-11 11:34:06 -07:00
hermes_dld.h
hermes_rid.h
hw.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
hw.h net: convert multicast list to list_head 2010-04-03 14:22:15 -07:00
Kconfig orinoco: add orinoco_usb driver 2010-05-03 14:53:08 -04:00
main.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
main.h orinoco: use cfg80211_find_ie 2010-04-19 16:41:42 -04:00
Makefile orinoco: add orinoco_usb driver 2010-05-03 14:53:08 -04:00
mic.c
mic.h
orinoco.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
orinoco_cs.c pcmcia: do not use io_req_t when calling pcmcia_request_io() 2010-08-03 09:04:11 +02:00
orinoco_nortel.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_pci.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_pci.h
orinoco_plx.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_tmd.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_usb.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 2010-07-27 11:59:19 -04:00
scan.c Merge branch 'master' into for-davem 2010-04-23 14:43:45 -04:00
scan.h
spectrum_cs.c pcmcia: do not use io_req_t when calling pcmcia_request_io() 2010-08-03 09:04:11 +02:00
wext.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2010-06-11 11:34:06 -07:00
wext.h