Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Jul 2010 00:34:14 +0000 (17:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Jul 2010 00:34:14 +0000 (17:34 -0700)
commit05318bc905467237d4aa68a701f6e92a2b332218
tree3b7577383bca50aeb442568aa16cf8f2167b8694
parentea812ca1b06113597adcd8e70c0f84a413d97544
parent88c1f4f6dffe66e2fed8e7e3276e091ee850bed0
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
drivers/net/wireless/libertas/host.h
13 files changed:
drivers/net/wireless/at76c50x-usb.c
drivers/net/wireless/at76c50x-usb.h
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/libertas/host.h
drivers/net/wireless/libertas/rx.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/rndis_wlan.c
include/net/cfg80211.h
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/rx.c
net/wireless/nl80211.c