diff options
-rw-r--r-- | block/elevator.c | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-transaction.c | 2 | ||||
-rw-r--r-- | fs/ntfs/ChangeLog | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/block/elevator.c b/block/elevator.c index 952aee04a68a..446aea2a3cfb 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
@@ -390,7 +390,7 @@ EXPORT_SYMBOL(elv_rb_find); | |||
390 | 390 | ||
391 | /* | 391 | /* |
392 | * Insert rq into dispatch queue of q. Queue lock must be held on | 392 | * Insert rq into dispatch queue of q. Queue lock must be held on |
393 | * entry. rq is sort insted into the dispatch queue. To be used by | 393 | * entry. rq is sort instead into the dispatch queue. To be used by |
394 | * specific elevators. | 394 | * specific elevators. |
395 | */ | 395 | */ |
396 | void elv_dispatch_sort(struct request_queue *q, struct request *rq) | 396 | void elv_dispatch_sort(struct request_queue *q, struct request *rq) |
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index 9959b799dbe2..c00d4a9b39e5 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c | |||
@@ -228,7 +228,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel, | |||
228 | * | 228 | * |
229 | * @param card the card from which to send the request | 229 | * @param card the card from which to send the request |
230 | * @param tcode the tcode for this transaction. Do not use | 230 | * @param tcode the tcode for this transaction. Do not use |
231 | * TCODE_LOCK_REQUEST directly, insted use TCODE_LOCK_MASK_SWAP | 231 | * TCODE_LOCK_REQUEST directly, instead use TCODE_LOCK_MASK_SWAP |
232 | * etc. to specify tcode and ext_tcode. | 232 | * etc. to specify tcode and ext_tcode. |
233 | * @param node_id the destination node ID (bus ID and PHY ID concatenated) | 233 | * @param node_id the destination node ID (bus ID and PHY ID concatenated) |
234 | * @param generation the generation for which node_id is valid | 234 | * @param generation the generation for which node_id is valid |
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog index ff2c79c8eddc..37c11e194372 100644 --- a/fs/ntfs/ChangeLog +++ b/fs/ntfs/ChangeLog | |||
@@ -1585,7 +1585,7 @@ tng-0.0.4 - Big changes, getting in line with Al Viro's comments. | |||
1585 | for reading $MFT (ntfs_mft_readpage). In the process create dedicated | 1585 | for reading $MFT (ntfs_mft_readpage). In the process create dedicated |
1586 | address space operations (ntfs_mft_aops) for $MFT inode mapping. Also | 1586 | address space operations (ntfs_mft_aops) for $MFT inode mapping. Also |
1587 | removed the now superfluous exports from the kernel core patch. | 1587 | removed the now superfluous exports from the kernel core patch. |
1588 | - Fix a bug where kfree() was used insted of ntfs_free(). | 1588 | - Fix a bug where kfree() was used instead of ntfs_free(). |
1589 | - Change map_mft_record() to take ntfs_inode as argument instead of | 1589 | - Change map_mft_record() to take ntfs_inode as argument instead of |
1590 | vfs inode. Dito for unmap_mft_record(). Adapt all callers. | 1590 | vfs inode. Dito for unmap_mft_record(). Adapt all callers. |
1591 | - Add pointer to ntfs_volume to ntfs_inode. | 1591 | - Add pointer to ntfs_volume to ntfs_inode. |