projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9c6531 63c361f)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
1  2 
drivers/net/wireless/iwlwifi/dvm/rs.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/rs.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/rx.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/scan.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/iwlwifi/dvm/rs.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/rs.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/rx.c
Simple merge