aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:58:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:58:52 -0500
commitf5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch)
tree7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /net/core
parent9853832c49dc1685587abeb4e1decd4be690d256 (diff)
parent1560a79a2c2ea0c3826150da8029991d685de990 (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/core')
-rw-r--r--net/core/net_namespace.c4
1 files changed, 2 insertions, 2 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 */