summaryrefslogtreecommitdiffstats
path: root/merge.pl
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-11-13 09:00:49 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2013-11-13 10:27:35 -0500
commit991987b30763184d46ed1546f0712f2f6111995a (patch)
treecb7be162f6259c6bcdedde3952b756bb37b12d94 /merge.pl
parent43260145fe3473020291436ef472240abc6e9bd0 (diff)
downloadkernel-991987b30763184d46ed1546f0712f2f6111995a.tar.gz
kernel-991987b30763184d46ed1546f0712f2f6111995a.tar.xz
kernel-991987b30763184d46ed1546f0712f2f6111995a.zip
Linux v3.12-7033-g42a2d92
Enable support for the new nf_tables stuff
Diffstat (limited to 'merge.pl')
0 files changed, 0 insertions, 0 deletions