Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits) Documentation: update broken web addresses. fix comment typo "choosed" -> "chosen" hostap:hostap_hw.c Fix typo in comment Fix spelling contorller -> controller in comments Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault fs/Kconfig: Fix typo Userpace -> Userspace Removing dead MACH_U300_BS26 drivers/infiniband: Remove unnecessary casts of private_data fs/ocfs2: Remove unnecessary casts of private_data libfc: use ARRAY_SIZE scsi: bfa: use ARRAY_SIZE drm: i915: use ARRAY_SIZE drm: drm_edid: use ARRAY_SIZE synclink: use ARRAY_SIZE block: cciss: use ARRAY_SIZE comment typo fixes: charater => character fix comment typos concerning "challenge" arm: plat-spear: fix typo in kerneldoc reiserfs: typo comment fix update email address ...
This commit is contained in:
@@ -937,7 +937,7 @@ config FAIL_MAKE_REQUEST
|
||||
Provide fault-injection capability for disk IO.
|
||||
|
||||
config FAIL_IO_TIMEOUT
|
||||
bool "Faul-injection capability for faking disk interrupts"
|
||||
bool "Fault-injection capability for faking disk interrupts"
|
||||
depends on FAULT_INJECTION && BLOCK
|
||||
help
|
||||
Provide fault-injection capability on end IO handling. This
|
||||
|
@@ -328,7 +328,7 @@ EXPORT_SYMBOL(pcim_iomap_regions_request_all);
|
||||
* @pdev: PCI device to map IO resources for
|
||||
* @mask: Mask of BARs to unmap and release
|
||||
*
|
||||
* Unamp and release regions specified by @mask.
|
||||
* Unmap and release regions specified by @mask.
|
||||
*/
|
||||
void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask)
|
||||
{
|
||||
|
@@ -127,7 +127,7 @@ core_initcall(random32_init);
|
||||
|
||||
/*
|
||||
* Generate better values after random number generator
|
||||
* is fully initalized.
|
||||
* is fully initialized.
|
||||
*/
|
||||
static int __init random32_reseed(void)
|
||||
{
|
||||
|
Reference in New Issue
Block a user