Merge branch 'master' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 16:56:46 +0000 (17:56 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 16:56:46 +0000 (17:56 +0100)
commita8c28d05150f758625c5da38199b247887735e65
treecf1f40f49bc0b1049b7d0f63ba5622028f07b924
parentd0b0268fddea3235a8df35e52167c3b206bf2f5a
parente3eaa9910b380530cfd2c0670fcd3f627674da8a
Merge branch 'master' of git://dev.medozas.de/linux
include/linux/netfilter/x_tables.h
net/netfilter/x_tables.c