projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa3c90b 5a32aff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
1  2 
drivers/net/wireless/ath/ath9k/init.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/ath/carl9170/main.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/cfg80211.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/ath/ath9k/init.c
Simple merge