projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43b03f1 daf67ce)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/dvm/testmode.c
drivers/net/wireless/iwlwifi/pcie/trans.c

1  2 
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/trans.c patch | diff1 | diff2 | blob | history