diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
| commit | 342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca (patch) | |
| tree | 1f967f283dade6e03897169bb29513354f49f910 /net | |
| parent | 50223e486cabdcf7e540e519da1f26bab3084e5d (diff) | |
| parent | 24ed7a97464db44592495f98cff8bcee02f92bc2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
trivial: fix typo in aic7xxx comment
trivial: fix comment typo in drivers/ata/pata_hpt37x.c
trivial: typo in kernel-parameters.txt
trivial: fix typo in tracing documentation
trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
trivial: remove unnecessary semicolons
trivial: Fix duplicated word "options" in comment
trivial: kbuild: remove extraneous blank line after declaration of usage()
trivial: improve help text for mm debug config options
trivial: doc: hpfall: accept disk device to unload as argument
trivial: doc: hpfall: reduce risk that hpfall can do harm
trivial: SubmittingPatches: Fix reference to renumbered step
trivial: fix typos "man[ae]g?ment" -> "management"
trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
trivial: fix missing printk space in amd_k7_smp_check
trivial: fix typo s/ketymap/keymap/ in comment
trivial: fix typo "to to" in multiple files
trivial: fix typos in comments s/DGBU/DBGU/
...
Diffstat (limited to 'net')
| -rw-r--r-- | net/rxrpc/ar-call.c | 2 | ||||
| -rw-r--r-- | net/sched/sch_hfsc.c | 2 | ||||
| -rw-r--r-- | net/wireless/wext-compat.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c index d9231245a79a..bc0019f704fe 100644 --- a/net/rxrpc/ar-call.c +++ b/net/rxrpc/ar-call.c | |||
| @@ -96,7 +96,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp) | |||
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | /* | 98 | /* |
| 99 | * allocate a new client call and attempt to to get a connection slot for it | 99 | * allocate a new client call and attempt to get a connection slot for it |
| 100 | */ | 100 | */ |
| 101 | static struct rxrpc_call *rxrpc_alloc_client_call( | 101 | static struct rxrpc_call *rxrpc_alloc_client_call( |
| 102 | struct rxrpc_sock *rx, | 102 | struct rxrpc_sock *rx, |
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 375d64cb1a3d..2c5c76be18f8 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | * The service curve parameters are converted to the internal | 77 | * The service curve parameters are converted to the internal |
| 78 | * representation. The slope values are scaled to avoid overflow. | 78 | * representation. The slope values are scaled to avoid overflow. |
| 79 | * the inverse slope values as well as the y-projection of the 1st | 79 | * the inverse slope values as well as the y-projection of the 1st |
| 80 | * segment are kept in order to to avoid 64-bit divide operations | 80 | * segment are kept in order to avoid 64-bit divide operations |
| 81 | * that are expensive on 32-bit architectures. | 81 | * that are expensive on 32-bit architectures. |
| 82 | */ | 82 | */ |
| 83 | 83 | ||
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 429dd06a4ecc..561a45cf2a6a 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c | |||
| @@ -834,7 +834,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev, | |||
| 834 | return 0; | 834 | return 0; |
| 835 | } | 835 | } |
| 836 | 836 | ||
| 837 | return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);; | 837 | return rdev->ops->set_tx_power(wdev->wiphy, type, dbm); |
| 838 | } | 838 | } |
| 839 | EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower); | 839 | EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower); |
| 840 | 840 | ||
