projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e31fc0 9dbf5f5)
Merge remote-tracking branch 'wireless/master' into mac80211
authorJohannes Berg <johannes.berg@intel.com>
Mon, 30 Jul 2012 07:13:03 +0000 (09:13 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 30 Jul 2012 07:13:03 +0000 (09:13 +0200)
1  2 
net/mac80211/scan.c patch | diff1 | diff2 | blob | history
net/wireless/reg.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/scan.c
Simple merge
diff --cc net/wireless/reg.c
Simple merge
Domain: System / Kernel;