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)
commit627ae3ddd6f929b4496502318a8896729fc37839
tree269fc2ea3b49c16864e97ee6b2ed0e7530bed79a
parent7bc057ffb5078d3e7f391ef2357f4ab01b9694e0
parenta59f975a78f0606a3a364939dfa9b949d5f87521
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