diff --git a/[refs] b/[refs]
index 1600fba08b88..957c2d7a94e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e281e3ac2b6c294d672034909883e7bb9e649ac7
+refs/heads/master: 3b2d59d1fc86cc7217f165100a939907802dc67c
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index e800b16fc920..2b87c1974be6 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -770,6 +770,7 @@ static u8 tcp_valid_flags[(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG) + 1] =
 {
 	[TH_SYN]			= 1,
 	[TH_SYN|TH_ACK]			= 1,
+	[TH_SYN|TH_ACK|TH_PUSH]		= 1,
 	[TH_RST]			= 1,
 	[TH_RST|TH_ACK]			= 1,
 	[TH_RST|TH_ACK|TH_PUSH]		= 1,