diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:40:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:40:58 -0500 |
| commit | 9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch) | |
| tree | 15c4222de2a2b2814c9430dcb4e997b18597881c /include/net | |
| parent | 7c2db36e730ee4facd341679ecb21ee73ba92831 (diff) | |
| parent | df63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Assorted tiny fixes queued in trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits)
DocBook: update EXPORT_SYMBOL entry to point at export.h
Documentation: update top level 00-INDEX file with new additions
ARM: at91/ide: remove unsused at91-ide Kconfig entry
percpu_counter.h: comment code for better readability
x86, efi: fix comment typo in head_32.S
IB: cxgb3: delay freeing mem untill entirely done with it
net: mvneta: remove unneeded version.h include
time: x86: report_lost_ticks doesn't exist any more
pcmcia: avoid static analysis complaint about use-after-free
fs/jfs: Fix typo in comment : 'how may' -> 'how many'
of: add missing documentation for of_platform_populate()
btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
sound: soc: Fix typo in sound/codecs
treewide: Fix typo in various drivers
btrfs: fix comment typos
Update ibmvscsi module name in Kconfig.
powerpc: fix typo (utilties -> utilities)
of: fix spelling mistake in comment
h8300: Fix home page URL in h8300/README
xtensa: Fix home page URL in Kconfig
...
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/irda/irlmp.h | 2 | ||||
| -rw-r--r-- | include/net/irda/irttp.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index 591f78631f13..f74109144d3f 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
| @@ -278,7 +278,7 @@ static inline int irlmp_lap_tx_queue_full(struct lsap_cb *self) | |||
| 278 | } | 278 | } |
| 279 | 279 | ||
| 280 | /* After doing a irlmp_dup(), this get one of the two socket back into | 280 | /* After doing a irlmp_dup(), this get one of the two socket back into |
| 281 | * a state where it's waiting incomming connections. | 281 | * a state where it's waiting incoming connections. |
| 282 | * Note : this can be used *only* if the socket is not yet connected | 282 | * Note : this can be used *only* if the socket is not yet connected |
| 283 | * (i.e. NO irlmp_connect_response() done on this socket). | 283 | * (i.e. NO irlmp_connect_response() done on this socket). |
| 284 | * - Jean II */ | 284 | * - Jean II */ |
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h index af4b87721d13..98682d4bae8f 100644 --- a/include/net/irda/irttp.h +++ b/include/net/irda/irttp.h | |||
| @@ -185,7 +185,7 @@ static inline __u32 irttp_get_max_seg_size(struct tsap_cb *self) | |||
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | /* After doing a irttp_dup(), this get one of the two socket back into | 187 | /* After doing a irttp_dup(), this get one of the two socket back into |
| 188 | * a state where it's waiting incomming connections. | 188 | * a state where it's waiting incoming connections. |
| 189 | * Note : this can be used *only* if the socket is not yet connected | 189 | * Note : this can be used *only* if the socket is not yet connected |
| 190 | * (i.e. NO irttp_connect_response() done on this socket). | 190 | * (i.e. NO irttp_connect_response() done on this socket). |
| 191 | * - Jean II */ | 191 | * - Jean II */ |
