Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index fa157712e982..a79b6cfb02a8 100644
--- a/include/net/gen_stats.h
+++ b/include/net/gen_stats.h
@@ -11,7 +11,7 @@ struct gnet_dump {
         struct sk_buff *  skb;
         struct nlattr *   tail;
 
-        /* Backward compatability */
+        /* Backward compatibility */
         int               compat_tc_stats;
         int               compat_xstats;
         void *            xstats;