projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d5c203 25b9ea5)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Mar 2013 20:53:47 +0000 (15:53 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Mar 2013 20:53:47 +0000 (15:53 -0500)
1  2 
drivers/net/wireless/iwlwifi/dvm/tx.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-trans.h patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mac80211.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/sta.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/tx.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/tx.c patch | diff1 | diff2 | blob | history

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