Merge branch 'master' into for-next

[linux-2.6-block.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 4ad1b78c9c7790a84d4e697da1e025213e3a0eae..9971ea1adc103aeaa8705cd147b010621b2656b9 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3439,7 +3439,7 @@ out:
  *     @rx_handler: receive handler to register
  *     @rx_handler_data: data pointer that is used by rx handler
  *
- *     Register a receive hander for a device. This handler will then be
+ *     Register a receive handler for a device. This handler will then be
  *     called from __netif_receive_skb. A negative errno code is returned
  *     on a failure.
  *