]> 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)
commitf19d0c8511f552efb2fb8a14c28db50338937f16
treeec99640b8d0b12adbfacb85c27683125debd14f2
parent9af0b085976797dc7c3aa7aaa96ff56ed059b888
parenta5fcd37d0678078b031a751e5d787bcfb35b2c0a
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