Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: kfifo: fix inaccurate comment tools/thermal: tmon: fix for segfault net: Spelling s/stucture/structure/ edd: don't spam log if no EDD information is present Documentation: Fix early-microcode.txt references after file rename tracing: Block comments should align the * on each line treewide: Fix typos in printk GenWQE: Fix a typo in two comments treewide: Align function definition open/close braces
这个提交包含在:
@@ -3861,7 +3861,7 @@ static int reset_atmel_card(struct net_device *dev)
|
||||
|
||||
set all the Mib values which matter in the card to match
|
||||
their settings in the atmel_private structure. Some of these
|
||||
can be altered on the fly, but many (WEP, infrastucture or ad-hoc)
|
||||
can be altered on the fly, but many (WEP, infrastructure or ad-hoc)
|
||||
can only be changed by tearing down the world and coming back through
|
||||
here.
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户