Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index e5f9676cf1bc..21f40779f52e 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -435,7 +435,7 @@ enum be_if_flags {
  * filtering capabilities. */
 struct be_cmd_req_if_create {
         struct be_cmd_req_hdr hdr;
-        u32 version;            /* ignore currntly */
+        u32 version;            /* ignore currently */
         u32 capability_flags;
         u32 enable_flags;
         u8 mac_addr[ETH_ALEN];