From: Patrick McHardy Date: Thu, 18 Feb 2010 10:41:39 +0000 (+0100) Subject: Merge branch 'ebt_config_compat_v4' of git://git.breakpoint.cc/fw/nf-next-2.6 X-Git-Tag: MMI-PSA29.97-13-9~24841^2~154 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=477c608673526afc094be521086fed186c7ccf7d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'ebt_config_compat_v4' of git://git.breakpoint.cc/fw/nf-next-2.6 --- 477c608673526afc094be521086fed186c7ccf7d