projects / platform / kernel / linux-exynos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef1b075 2c316e6)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
1  2 
include/uapi/linux/nl80211.h patch | diff1 | diff2 | blob | history
net/mac80211/ieee80211_i.h patch | diff1 | diff2 | blob | history
net/mac80211/mlme.c patch | diff1 | diff2 | blob | history

diff --cc include/uapi/linux/nl80211.h
Simple merge
diff --cc net/mac80211/ieee80211_i.h
Simple merge
diff --cc net/mac80211/mlme.c
Simple merge
Domain: System / Kernel;