[GFS2] Fix up merge of Linus' kernel into GFS2

[linux-2.6-omap-h63xx.git] / include / linux / udp.h

diff --git a/include/linux/udp.h b/include/linux/udp.h
index bdd39be094065fa5a53c26864e9db5feb51e5122..90223f057d507bd86edf2c8e30333319773e8f23 100644 (file)
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -46,7 +46,7 @@ struct udp_sock {
        unsigned int     corkflag;      /* Cork is required */
        __u16            encap_type;    /* Is this an Encapsulation socket? */
        /*
-        * Following member retains the infomation to create a UDP header
+        * Following member retains the information to create a UDP header
         * when the socket is uncorked.
         */
        __u16            len;           /* total length of pending frames */