From: David S. Miller Date: Fri, 10 Jan 2014 19:50:02 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next X-Git-Tag: android-x86-4.4-r2~1808^2~239 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef8570d859a5872db525ec1464165352e4f2bdaa;p=android-x86%2Fkernel.git Merge branch 'master' of git://git./linux/kernel/git/pablo/nf-next Pablo Neira Ayuso says: ==================== This batch contains one single patch with the l2tp match for xtables, from James Chapman. ==================== Signed-off-by: David S. Miller --- ef8570d859a5872db525ec1464165352e4f2bdaa