lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source 
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/wl12xx/wl1271_main.c
This commit is contained in:
John W. Linville
2010-04-15 16:21:34 -04:00
parent fea0691526 a5e944f1d9
commit 5c01d56693
174 changed files with 8602 additions and 5618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/wireless/reg.c
View File

@ -2356,10 +2356,10 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
rdev->country_ie_alpha2[1]);
} else
printk(KERN_INFO "cfg80211: Current regulatory "
"domain intersected: \n");
"domain intersected:\n");
} else
printk(KERN_INFO "cfg80211: Current regulatory "
"domain intersected: \n");
printk(KERN_INFO "cfg80211: Current regulatory "
"domain intersected:\n");
} else if (is_world_regdom(rd->alpha2))
printk(KERN_INFO "cfg80211: World regulatory "
"domain updated:\n");