projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c88d0dc 36eed56)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c

1  2 
drivers/net/wireless/iwlwifi/dvm/mac80211.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mac80211.c patch | diff1 | diff2 | blob | history