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

Conflicts:
	drivers/net/qlcnic/qlcnic_init.c
	net/ipv4/ip_output.c

2010-09-27 01:03:03 -07:00

..

ath

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

2010-09-21 15:49:14 -04:00

b43

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

2010-09-02 13:30:07 -04:00

b43legacy

b43legacy: update hw/fw version info in wiphy struct

2010-08-16 14:39:45 -04:00

hostap

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

2010-08-25 14:51:42 -04:00

ipw2x00

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

2010-08-25 14:51:42 -04:00

iwlwifi

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

2010-09-27 01:03:03 -07:00

iwmc3200wifi

iwm3200wifi: remove comparison to WIFI_IF_NTFY_MAX in iwm_ntf_wifi_if_wrapper

2010-08-16 14:39:48 -04:00

libertas

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

2010-09-21 15:49:14 -04:00

libertas_tf

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

2010-08-25 14:51:42 -04:00

orinoco

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

2010-09-02 13:30:07 -04:00

p54

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

2010-09-21 15:49:14 -04:00

prism54

drivers/net/wireless/prism54: Adjust confusing if indentation

2010-08-16 15:26:41 -04:00

rt2x00

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

2010-09-21 15:49:14 -04:00

rtl818x

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

2010-08-24 16:35:40 -04:00

wl12xx

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

2010-09-21 15:49:14 -04:00

zd1211rw

zd1211rw: update fw version info in wiphy struct

2010-08-16 14:39:45 -04:00

adm8211.c

drivers/net/wireless: Restore upper case words in wiphy_<level> messages

2010-08-18 16:37:44 -04:00

adm8211.h

…

airo_cs.c

pcmcia: do not request windows if you don't need to

2010-08-03 09:04:21 +02:00

airo.c

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

2010-09-21 15:49:14 -04:00

airo.h

…

at76c50x-usb.c

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

2010-08-24 16:35:40 -04:00

at76c50x-usb.h

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

2010-07-01 17:34:14 -07:00

atmel_cs.c

pcmcia: do not use io_req_t when calling pcmcia_request_io()

2010-08-03 09:04:11 +02:00

atmel_pci.c

…

atmel.c

…

atmel.h

…

Kconfig

…

mac80211_hwsim.c

mac80211: add p2p device type support

2010-09-16 15:46:07 -04:00

Makefile

wl12xx: add platform data passing support

2010-09-21 11:04:57 -04:00

mwl8k.c

drivers/net/wireless: Restore upper case words in wiphy_<level> messages

2010-08-18 16:37:44 -04:00

ray_cs.c

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

2010-09-21 15:49:14 -04:00

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

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

2010-07-01 17:34:14 -07:00

wl3501_cs.c

ethtool: Provide a default implementation of ethtool_ops::get_drvinfo

2010-08-17 02:31:15 -07:00

wl3501.h

…

zd1201.c

…

zd1201.h

…