projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: daa16bc c288ec6)
Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Mon, 5 Mar 2012 17:32:58 +0000 (19:32 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 5 Mar 2012 17:32:58 +0000 (19:32 +0200)
Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c

1  2 
drivers/net/wireless/ath/ath6kl/cfg80211.c patch | diff1 | diff2 | blob | history