Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 20 Mar 2013 13:30:42 +0000 (14:30 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 20 Mar 2013 13:30:42 +0000 (14:30 +0100)
1  2 
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/tx.c
drivers/net/wireless/iwlwifi/pcie/tx.c

Simple merge