Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index e7fa29e576dc..77f304680d86 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -995,7 +995,7 @@ static int tcp_packet(struct ip_conntrack *conntrack,
                         || (!test_bit(IPS_ASSURED_BIT, &conntrack->status)
                             && conntrack->proto.tcp.last_index == TCP_ACK_SET))
                     && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) {
-                        /* RST sent to invalid SYN or ACK we had let trough
+                        /* RST sent to invalid SYN or ACK we had let through
                          * at a) and c) above:
                          *
                          * a) SYN was in window then
@@ -1006,7 +1006,7 @@ static int tcp_packet(struct ip_conntrack *conntrack,
                          * segments we ignored. */
                         goto in_window;
                 }
-                /* Just fall trough */
+                /* Just fall through */
         default:
                 /* Keep compilers happy. */
                 break;