]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Feb 2012 21:24:37 +0000 (16:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Feb 2012 21:24:37 +0000 (16:24 -0500)
commited27bbef7d5700eebb32b22d1c51d70aeff356e7
treebe05512153a9cd5cbe1f1234bc09fd9cd388ec58
parentc94f0b63283f30391c0dd0a50839b811bf0bce04
parente88ee866b094fb24f93a0e0d7b66c2ec37255d34
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
12 files changed:
MAINTAINERS
drivers/bcma/main.c
drivers/bcma/scan.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/rt2x00/rt2800lib.c
net/mac80211/main.c
net/mac80211/rx.c