diff options
| author | Linus Torvalds | 2006-01-05 01:34:57 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-05 01:34:57 +0100 |
| commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
| tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /net/irda | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| parent | Documentation/filesystems/00-INDEX: remove entry for fat_cvf.txt (diff) | |
| download | kernel-qcow2-linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.gz kernel-qcow2-linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.xz kernel-qcow2-linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/iriap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/iriap.c b/net/irda/iriap.c index b8bb78af8b8a..254f90746900 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c @@ -364,7 +364,7 @@ static void iriap_disconnect_request(struct iriap_cb *self) /* * Function iriap_getvaluebyclass (addr, name, attr) * - * Retreive all values from attribute in all objects with given class + * Retrieve all values from attribute in all objects with given class * name */ int iriap_getvaluebyclass_request(struct iriap_cb *self, |