aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-24 16:41:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-24 16:41:39 -0400
commit229aebb873e29726b91e076161649cf45154b0bf (patch)
treeacc02a3702215bce8d914f4c8cc3d7a1382b1c67 /block
parent8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff)
parent50a23e6eec6f20d55a3a920e47adb455bff6046e (diff)
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: (39 commits) Update broken web addresses in arch directory. Update broken web addresses in the kernel. Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget Revert "Fix typo: configuation => configuration" partially ida: document IDA_BITMAP_LONGS calculation ext2: fix a typo on comment in ext2/inode.c drivers/scsi: Remove unnecessary casts of private_data drivers/s390: Remove unnecessary casts of private_data net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data drivers/infiniband: Remove unnecessary casts of private_data drivers/gpu/drm: Remove unnecessary casts of private_data kernel/pm_qos_params.c: Remove unnecessary casts of private_data fs/ecryptfs: Remove unnecessary casts of private_data fs/seq_file.c: Remove unnecessary casts of private_data arm: uengine.c: remove C99 comments arm: scoop.c: remove C99 comments Fix typo configue => configure in comments Fix typo: configuation => configuration Fix typo interrest[ing|ed] => interest[ing|ed] Fix various typos of valid in comments ... Fix up trivial conflicts in: drivers/char/ipmi/ipmi_si_intf.c drivers/usb/gadget/rndis.c net/irda/irnet/irnet_ppp.c
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 51efd835d4cf..881fe44ec7da 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1669,7 +1669,7 @@ EXPORT_SYMBOL(submit_bio);
1669 * the insertion using this generic function. 1669 * the insertion using this generic function.
1670 * 1670 *
1671 * This function should also be useful for request stacking drivers 1671 * This function should also be useful for request stacking drivers
1672 * in some cases below, so export this fuction. 1672 * in some cases below, so export this function.
1673 * Request stacking drivers like request-based dm may change the queue 1673 * Request stacking drivers like request-based dm may change the queue
1674 * limits while requests are in the queue (e.g. dm's table swapping). 1674 * limits while requests are in the queue (e.g. dm's table swapping).
1675 * Such request stacking drivers should check those requests agaist 1675 * Such request stacking drivers should check those requests agaist