projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03c4444 d3a58df)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 29 May 2014 16:55:38 +0000 (12:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 May 2014 16:55:38 +0000 (12:55 -0400)
1  2 
net/mac80211/sta_info.c patch | diff1 | diff2 | blob | history
net/mac80211/status.c patch | diff1 | diff2 | blob | history
net/mac80211/trace.h patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/sta_info.c
Simple merge
diff --cc net/mac80211/status.c
Simple merge
diff --cc net/mac80211/trace.h
Simple merge
John Crispins staging tree