projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caf1578 9e6f3f4)
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
1  2 
drivers/net/wireless/iwlwifi/mvm/fw.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mac80211.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mvm.h patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/ops.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/trans.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/iwlwifi/mvm/fw.c
Simple merge