projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9109e17 a31267c)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Mar 2014 19:22:17 +0000 (15:22 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Mar 2014 19:22:17 +0000 (15:22 -0400)
1  2 
drivers/net/wireless/mwifiex/main.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/scan.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/mwifiex/main.c
Simple merge
diff --cc drivers/net/wireless/mwifiex/scan.c
Simple merge
John Crispins staging tree