diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-05 11:56:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-05 11:56:35 -0700 |
| commit | 672a9c106966f8d418478830975288b8096bb058 (patch) | |
| tree | e47259d8a96084affaab87b0104b56ac352dc0eb /drivers/net/wireless/atmel | |
| parent | e8403b493fd5180e351ca67eb66406d95dadcd0b (diff) | |
| parent | 75a24b822d383489badd343cab4cb171d09f93ef (diff) | |
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
Diffstat (limited to 'drivers/net/wireless/atmel')
| -rw-r--r-- | drivers/net/wireless/atmel/atmel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c index c9dd5e44c9c6..d122386c382b 100644 --- a/drivers/net/wireless/atmel/atmel.c +++ b/drivers/net/wireless/atmel/atmel.c @@ -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. |