diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /net | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'net')
-rw-r--r-- | net/core/net_namespace.c | 4 | ||||
-rw-r--r-- | net/rfkill/rfkill.c | 2 | ||||
-rw-r--r-- | net/sctp/sm_statefuns.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 26e941d912e8..7b660834a4c2 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c | |||
@@ -287,7 +287,7 @@ EXPORT_SYMBOL_GPL(register_pernet_subsys); | |||
287 | * @ops: pernet operations structure to manipulate | 287 | * @ops: pernet operations structure to manipulate |
288 | * | 288 | * |
289 | * Remove the pernet operations structure from the list to be | 289 | * Remove the pernet operations structure from the list to be |
290 | * used when network namespaces are created or destoryed. In | 290 | * used when network namespaces are created or destroyed. In |
291 | * addition run the exit method for all existing network | 291 | * addition run the exit method for all existing network |
292 | * namespaces. | 292 | * namespaces. |
293 | */ | 293 | */ |
@@ -335,7 +335,7 @@ EXPORT_SYMBOL_GPL(register_pernet_device); | |||
335 | * @ops: pernet operations structure to manipulate | 335 | * @ops: pernet operations structure to manipulate |
336 | * | 336 | * |
337 | * Remove the pernet operations structure from the list to be | 337 | * Remove the pernet operations structure from the list to be |
338 | * used when network namespaces are created or destoryed. In | 338 | * used when network namespaces are created or destroyed. In |
339 | * addition run the exit method for all existing network | 339 | * addition run the exit method for all existing network |
340 | * namespaces. | 340 | * namespaces. |
341 | */ | 341 | */ |
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 6562f868e82f..1a47f5d1be17 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
@@ -340,7 +340,7 @@ EXPORT_SYMBOL(rfkill_allocate); | |||
340 | * rfkill_free - Mark rfkill structure for deletion | 340 | * rfkill_free - Mark rfkill structure for deletion |
341 | * @rfkill: rfkill structure to be destroyed | 341 | * @rfkill: rfkill structure to be destroyed |
342 | * | 342 | * |
343 | * Decrements reference count of rfkill structure so it is destoryed. | 343 | * Decrements reference count of rfkill structure so it is destroyed. |
344 | * Note that rfkill_free() should _not_ be called after rfkill_unregister(). | 344 | * Note that rfkill_free() should _not_ be called after rfkill_unregister(). |
345 | */ | 345 | */ |
346 | void rfkill_free(struct rfkill *rfkill) | 346 | void rfkill_free(struct rfkill *rfkill) |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 61cbd5a8dd0c..5df0c4bd415b 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -537,7 +537,7 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(const struct sctp_endpoint *ep, | |||
537 | * | 537 | * |
538 | * This means that if we only want to abort associations | 538 | * This means that if we only want to abort associations |
539 | * in an authenticated way (i.e AUTH+ABORT), then we | 539 | * in an authenticated way (i.e AUTH+ABORT), then we |
540 | * can't destory this association just becuase the packet | 540 | * can't destroy this association just becuase the packet |
541 | * was malformed. | 541 | * was malformed. |
542 | */ | 542 | */ |
543 | if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc)) | 543 | if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc)) |
@@ -4130,7 +4130,7 @@ static sctp_disposition_t sctp_sf_abort_violation( | |||
4130 | * | 4130 | * |
4131 | * This means that if we only want to abort associations | 4131 | * This means that if we only want to abort associations |
4132 | * in an authenticated way (i.e AUTH+ABORT), then we | 4132 | * in an authenticated way (i.e AUTH+ABORT), then we |
4133 | * can't destory this association just becuase the packet | 4133 | * can't destroy this association just becuase the packet |
4134 | * was malformed. | 4134 | * was malformed. |
4135 | */ | 4135 | */ |
4136 | if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc)) | 4136 | if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc)) |