aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_vti.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-11-30 15:05:41 -0500
committerDavid S. Miller <davem@davemloft.net>2015-11-30 15:05:41 -0500
commit43cd6991a04bd83c894dbbee53c6e60a343b6033 (patch)
tree6e6bac1b49009ed4e0766f8e325ef5d53a6626c6 /net/ipv4/ip_vti.c
parentnet: Generalise wq_has_sleeper helper (diff)
parentmlxsw: core: Implement fan control using hwmon (diff)
downloadlinux-dev-43cd6991a04bd83c894dbbee53c6e60a343b6033.tar.xz
linux-dev-43cd6991a04bd83c894dbbee53c6e60a343b6033.zip
Merge branch 'mlxsw-hwmon'
Jiri Pirko says: ==================== mlxsw: driver update This patchset carries support for port identification, monitoring of ASIC temperature and board fans. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_vti.c')
0 files changed, 0 insertions, 0 deletions