John W. Linville 800f65bba8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

2010-07-27 11:59:19 -04:00

..

airport.c

orinoco: encapsulate driver locking

2010-05-03 14:53:07 -04:00

cfg.c

cfg80211/mac80211: better channel handling

2010-05-07 14:55:50 -04:00

cfg.h

…

fw.c

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

fw.h

…

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

…

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

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_cs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-20 21:04:44 -07: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

orinoco.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

scan.c

Merge branch 'master' into for-davem

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

scan.h

…

spectrum_cs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-20 21:04:44 -07: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

…