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

Conflicts:
	drivers/net/benet/be_cmds.h
	include/linux/sysctl.h

2010-01-10 22:55:03 -08:00

..

ath

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

b43

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2009-12-30 13:51:29 -08:00

b43legacy

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2009-12-30 13:51:29 -08:00

hostap

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

ipw2x00

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

iwlwifi

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

iwmc3200wifi

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2009-12-30 13:51:29 -08:00

libertas

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

2010-01-10 22:55:03 -08:00

libertas_tf

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2009-12-30 15:25:08 -05:00

orinoco

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

p54

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

prism54

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

rt2x00

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

rtl818x

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

wl12xx

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2009-12-30 15:25:08 -05:00

zd1211rw

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2009-12-30 13:51:29 -08:00

adm8211.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

adm8211.h

…

airo_cs.c

…

airo.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

airo.h

…

at76c50x-usb.c

mac80211: remove struct ieee80211_if_init_conf

2009-12-28 16:55:07 -05:00

at76c50x-usb.h

…

atmel_cs.c

…

atmel_pci.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

atmel.c

…

atmel.h

…

Kconfig

…

mac80211_hwsim.c

mac80211: remove struct ieee80211_if_init_conf

2009-12-28 16:55:07 -05:00

Makefile

…

mwl8k.c

mac80211: remove struct ieee80211_if_init_conf

2009-12-28 16:55:07 -05:00

ray_cs.c

…

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

rndis_wlan: copy module parameters for bcm4320a devices too

2009-12-21 18:56:05 -05:00

wl3501_cs.c

…

wl3501.h

…

zd1201.c

…

zd1201.h

…