projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 433131b 4e3b3bc)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Mar 2014 18:21:43 +0000 (14:21 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Mar 2014 18:21:43 +0000 (14:21 -0400)
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c

1  2 
drivers/net/wireless/mwifiex/main.c patch | diff1 | diff2 | blob | history
net/mac80211/iface.c patch | diff1 | diff2 | blob | history
net/wireless/chan.c patch | diff1 | diff2 | blob | history
net/wireless/util.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/mwifiex/main.c
Simple merge
diff --cc net/mac80211/iface.c
Simple merge
diff --cc net/wireless/chan.c
Simple merge
diff --cc net/wireless/util.c
Simple merge