]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit63a808a89bba1c4bd378d29f5cecf5aafc84ab27
tree35fa0d1defaaf94641963a49126d7bb475ffa4c6
parent4b32a8e5a1c890cdad2aa753872359a13d7ff207
parentff1b85decd59036b4ef7b9dd6a54c981838fdc7d
Merge branch 'master' of git://git.kernel.org/pub/scm/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