Merge branches 'acpi-dptf' and 'acpi-messages'

[linux-2.6-microblaze.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 84a8049..27e3e7d 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -3568,7 +3568,7 @@ EXPORT_SYMBOL(kernel_accept);
  *     @addrlen: address length
  *     @flags: flags (O_NONBLOCK, ...)
  *
- *     For datagram sockets, @addr is the addres to which datagrams are sent
+ *     For datagram sockets, @addr is the address to which datagrams are sent
  *     by default, and the only address from which datagrams are received.
  *     For stream sockets, attempts to connect to @addr.
  *     Returns 0 or an error code.