summaryrefslogtreecommitdiff
path: root/conntrack.h
blob: d37d209aa70e1a44845644ab7062b7643377d019 (plain)
1
2
3
4
5
6
7
8
9
#ifndef CONNTRACK_H
#define CONNTRACK_H

#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
#include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
#include <libnetfilter_conntrack/libnetfilter_conntrack_dccp.h>
#include <libnetfilter_conntrack/libnetfilter_conntrack_sctp.h>

#endif /* CONNTRACK_H */
ion>
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-12 08:44:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-12 08:44:23 -0800
commit0261b5d3a6ed43fa8f801ded6e265d1f3403ad24 (patch)
tree867174b8aa40d33b25511bd0d09d3e9c25b6bf4e
parent067d14f0dde8c7d7c41064e7eb021db7477c9aac (diff)
parent07c65a665b8d88f871d8083644ba3f41e68f048f (diff)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer: "There are two sets of changes in this pull. The largest is the addition of the ColdFire platform side i2c support (the IO addressing, setup and clock definitions). The i2c hardware module itself is driven by the kernels existing iMX i2c driver. The other change is the addition of support for the Amcore board" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: AMCORE board, add iMX i2c support m68k: add Sysam AMCORE open board support m68knommu: platform support for i2c devices on ColdFire SoC
Diffstat