diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
commit | a3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch) | |
tree | 648bbeea304950d02e71863673be8154a5e491f6 /net/core/skbuff.c | |
parent | c2de187e5b0f25b572ac1cb6cdf383f16123717d (diff) | |
parent | ebb47241ea0eac6a5a23404821a2d62f64c68496 (diff) | |
download | linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.gz linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.bz2 linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.zip |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 801dd08908f9..7ebeed0a877c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2267,7 +2267,7 @@ EXPORT_SYMBOL(skb_prepare_seq_read); * of bytes already consumed and the next call to * skb_seq_read() will return the remaining part of the block. * - * Note 1: The size of each block of data returned can be arbitary, + * Note 1: The size of each block of data returned can be arbitrary, * this limitation is the cost for zerocopy seqeuental * reads of potentially non linear data. * |