projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 03f52a0 0751f86)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Nov 2012 15:56:03 +0000 (10:56 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Nov 2012 15:56:03 +0000 (10:56 -0500)
commit79d38f7d6cf545ff838dd5227869f3916d1d100d
tree859c8071aab68fd32f36ffb9ebc04cf12db6e5e0tree | snapshot (tar.gz zip)
parent03f52a0a554210d5049eeed9f1bb29047dc807cbcommit | diff
parent0751f8654602e4255f0b9c17784d8100d5896010commit | diff
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
MAINTAINERS diff1 | diff2 | blob | history