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
This commit is contained in:
@@ -252,7 +252,7 @@ ath_tid_pull(struct ath_atx_tid *tid)
|
||||
}
|
||||
|
||||
return skb;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static bool ath_tid_has_buffered(struct ath_atx_tid *tid)
|
||||
|
@@ -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.
|
||||
|
||||
|
@@ -4431,7 +4431,7 @@ void rtl8xxxu_gen1_init_aggregation(struct rtl8xxxu_priv *priv)
|
||||
timeout = page_thresh;
|
||||
else if (rtl8xxxu_dma_agg_pages <= 6)
|
||||
dev_err(&priv->udev->dev,
|
||||
"%s: dma_agg_pages=%i too small, minium is 6\n",
|
||||
"%s: dma_agg_pages=%i too small, minimum is 6\n",
|
||||
__func__, rtl8xxxu_dma_agg_pages);
|
||||
else
|
||||
dev_err(&priv->udev->dev,
|
||||
|
Verwijs in nieuw issue
Block a user