Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 17 Jun 2010 21:19:06 +0000 (14:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Jun 2010 21:19:06 +0000 (14:19 -0700)
commitbb9c03d8a6893517737b16fdbeb54be3c73b3023
tree35fa0d1defaaf94641963a49126d7bb475ffa4c6
parent4de57826810fd2cfeb2ab5c7d003ff9116b8f7ee
parentabf52f86aa0a49a7377350cafa8f218c4cd227e7
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
12 files changed:
MAINTAINERS
drivers/net/wireless/hostap/hostap_wlan.h
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/rt2x00/rt2800.h
drivers/net/wireless/zd1211rw/zd_mac.h
include/net/cfg80211.h
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/rx.c
net/mac80211/sta_info.c
net/wireless/nl80211.c