Merge branch 'master' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Mon, 10 Aug 2009 15:14:59 +0000 (17:14 +0200)
committerPatrick McHardy <kaber@trash.net>
Mon, 10 Aug 2009 15:14:59 +0000 (17:14 +0200)
commitdc05a564ab1b3a1957927da50912964b61f7da69
tree489905675f9954e5bf160a2eff6ea6ce93472d61
parentbe39ee11cd1f67b51ac8e71d177a981eb34f2ab2
parente2fe35c17fed62d4ab5038fa9bc489e967ff8416
Merge branch 'master' of git://dev.medozas.de/linux
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c