]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' into for-davem
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Apr 2012 18:25:14 +0000 (14:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Apr 2012 18:41:59 +0000 (14:41 -0400)
commit84ffadb27c1b4573b45fb34ca07928bdd236c082
treeec99640b8d0b12adbfacb85c27683125debd14f2
parent068497487df98a3b726bad4359e395d1d689aef8
parent061269cc5430b95c8e1be84c9ff09306251bfa1a
Merge branch 'master' into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c
MAINTAINERS
drivers/net/wireless/ipw2x00/ipw2100.h
drivers/net/wireless/iwlwifi/iwl-testmode.c
drivers/net/wireless/mac80211_hwsim.c
net/wireless/nl80211.c
net/wireless/wext-core.c