summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_udp_tunnel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-31 07:42:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-31 07:42:39 -0700
commitc877b3df8527f010ef068704033acac1d43cbf8c (patch)
tree2d305debb82348b60dff997c34ca318b17e87338 /net/ipv6/ip6_udp_tunnel.c
parentb5c8314f0ebadb6d8a9789cb2d646cbef8448073 (diff)
parentd498bc0ce8acb4a1bb80d6089d1932d919dc2532 (diff)
Merge tag 'dmaengine-fix-5.1-rc3' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul: - Revert "dmaengine: stm32-mdma: Add a check on read_u32_array" as that caused regression - Fix MAINTAINER file uniphier-mdmac.c file path * tag 'dmaengine-fix-5.1-rc3' of git://git.infradead.org/users/vkoul/slave-dma: MAINTAINERS: Fix uniphier-mdmac.c file path dmaengine: stm32-mdma: Revert "dmaengine: stm32-mdma: Add a check on read_u32_array"
Diffstat (limited to 'net/ipv6/ip6_udp_tunnel.c')
0 files changed, 0 insertions, 0 deletions