]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 13 Jun 2012 07:01:22 +0000 (09:01 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 13 Jun 2012 07:01:28 +0000 (09:01 +0200)
commit91d16a8b2d0bbcacd6d25631cea5cfbba7483b5c
tree269fc2ea3b49c16864e97ee6b2ed0e7530bed79a
parent98c370ee122ca8b934240fc9aebbe863d57b17a0
parentbf837416e0702f813803267554486b6d7d48edc6
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/pcie/trans.c