projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f61759e 9995ffe)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Dec 2011 16:05:44 +0000 (11:05 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Dec 2011 16:05:44 +0000 (11:05 -0500)
1  2 
net/mac80211/util.c patch | diff1 | diff2 | blob | history
net/wireless/reg.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/util.c
Simple merge
diff --cc net/wireless/reg.c
Simple merge
John Crispins staging tree