projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dbe51c 801d929)
Merge remote-tracking branch 'mac80211/master' into HEAD
authorJohannes Berg <[email protected]>
Wed, 6 Mar 2013 15:33:12 +0000 (16:33 +0100)
committerJohannes Berg <[email protected]>
Wed, 6 Mar 2013 15:33:12 +0000 (16:33 +0100)
There are a few things that would otherwise conflict.

Signed-off-by: Johannes Berg <[email protected]>
1  2 
net/mac80211/tx.c patch | diff1 | diff2 | blob | history
net/wireless/core.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/tx.c
Simple merge
diff --cc net/wireless/core.c
Simple merge
John Crispins staging tree