Merge branch 'ebt_config_compat_v4' of git://git.breakpoint.cc/fw/nf-next-2.6
commit477c608673526afc094be521086fed186c7ccf7d
authorPatrick McHardy <kaber@trash.net>
Thu, 18 Feb 2010 10:41:39 +0000 (18 11:41 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 18 Feb 2010 10:41:39 +0000 (18 11:41 +0100)
tree7a4dd0165afa6c1cddadf4c88eeca07c861031ce
parent6457d26bd40077238799e31df2b800bcf4ef9177
parent6e705f56a181118f6fbd35e6b443eab33df07290
Merge branch 'ebt_config_compat_v4' of git://git.breakpoint.cc/fw/nf-next-2.6