projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0ecde1 79733a8)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 May 2010 05:53:41 +0000 (22:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 May 2010 05:53:41 +0000 (22:53 -0700)
1  2 
drivers/net/wireless/ath/ar9170/usb.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-scan.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl3945-base.c patch | diff1 | diff2 | blob | history
net/mac80211/mlme.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/ath/ar9170/usb.c
Simple merge
diff --cc net/mac80211/mlme.c
Simple merge