Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits) trivial: fix typo in aic7xxx comment trivial: fix comment typo in drivers/ata/pata_hpt37x.c trivial: typo in kernel-parameters.txt trivial: fix typo in tracing documentation trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c trivial: remove unnecessary semicolons trivial: Fix duplicated word "options" in comment trivial: kbuild: remove extraneous blank line after declaration of usage() trivial: improve help text for mm debug config options trivial: doc: hpfall: accept disk device to unload as argument trivial: doc: hpfall: reduce risk that hpfall can do harm trivial: SubmittingPatches: Fix reference to renumbered step trivial: fix typos "man[ae]g?ment" -> "management" trivial: media/video/cx88: add __init/__exit macros to cx88 drivers trivial: fix typo in CONFIG_DEBUG_FS in gcov doc trivial: fix missing printk space in amd_k7_smp_check trivial: fix typo s/ketymap/keymap/ in comment trivial: fix typo "to to" in multiple files trivial: fix typos in comments s/DGBU/DBGU/ ...
此提交包含在:
@@ -96,7 +96,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
|
||||
}
|
||||
|
||||
/*
|
||||
* allocate a new client call and attempt to to get a connection slot for it
|
||||
* allocate a new client call and attempt to get a connection slot for it
|
||||
*/
|
||||
static struct rxrpc_call *rxrpc_alloc_client_call(
|
||||
struct rxrpc_sock *rx,
|
||||
|
@@ -77,7 +77,7 @@
|
||||
* The service curve parameters are converted to the internal
|
||||
* representation. The slope values are scaled to avoid overflow.
|
||||
* the inverse slope values as well as the y-projection of the 1st
|
||||
* segment are kept in order to to avoid 64-bit divide operations
|
||||
* segment are kept in order to avoid 64-bit divide operations
|
||||
* that are expensive on 32-bit architectures.
|
||||
*/
|
||||
|
||||
|
@@ -834,7 +834,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);;
|
||||
return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower);
|
||||
|
||||
|
新增問題並參考
封鎖使用者