summaryrefslogtreecommitdiffstats
path: root/net/sctp/input.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-04-14 00:32:13 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-04-14 00:32:13 +0200
commita84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch)
treeba054d4b1a20dadec088fd4d8983fb5939227e46 /net/sctp/input.c
parentARM: 6872/1: arch:common:Makefile Remove unused config in the Makefile. (diff)
parentARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio() (diff)
downloadlinux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.tar.xz
linux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.zip
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'net/sctp/input.c')
-rw-r--r--net/sctp/input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c
index 826661be73e7..5436c6921167 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -1034,7 +1034,7 @@ static struct sctp_association *__sctp_rcv_asconf_lookup(
* association.
*
* This means that any chunks that can help us identify the association need
-* to be looked at to find this assocation.
+* to be looked at to find this association.
*/
static struct sctp_association *__sctp_rcv_walk_lookup(struct sk_buff *skb,
const union sctp_addr *laddr,