projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f404c2f f435d9e)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 17:50:47 +0000 (09:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 17:50:47 +0000 (09:50 -0800)
commit1e13f863ca88014d9550876c05c939fdab1017d1
tree1ede9804ee33d7eefb73e9535e0399dfd7f58c00tree | snapshot (tar.gz zip)
parentf404c2fea37e02bec7c8b6edddf5edd22ca60505commit | diff
parentf435d9eea01309aa7b6c1f134569a7b5957918aecommit | diff
Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c diff1 | diff2 | blob | history