Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[~andy/linux] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 5212447c86e72b44a8ab91fabb05781b1a5026d0..310d16b1b3c9cbbb1d401f19f24c6a61d0df4404 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2986,7 +2986,7 @@ out:
 
 /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE
  * for some operations; this forces use of the newer bridge-utils that
- * use compatiable ioctls
+ * use compatible ioctls
  */
 static int old_bridge_ioctl(compat_ulong_t __user *argp)
 {