summaryrefslogtreecommitdiff
path: root/net/irda
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 16:34:57 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 16:34:57 -0800
commit52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch)
treed956016f7aefff1030ca0f7885ac6a6f890a9e94 /net/irda
parent1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff)
parent48d727a9f93e617d6d443507acf7d1b849c63366 (diff)
downloadlinux-3.10-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.gz
linux-3.10-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.bz2
linux-3.10-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index b8bb78af8b8..254f9074690 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,