summaryrefslogtreecommitdiffstats
path: root/include/net/udp_tunnel.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-18 21:50:55 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-18 21:50:55 +0100
commitd90f351a9bec6af3e8e7cefbbff94072461c3c9a (patch)
tree71db07e8820b63a60fefcd7e3d1f044450a4b55d /include/net/udp_tunnel.h
parentMerge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentmmc: atmel: get rid of struct mci_dma_data (diff)
downloadlinux-d90f351a9bec6af3e8e7cefbbff94072461c3c9a.tar.xz
linux-d90f351a9bec6af3e8e7cefbbff94072461c3c9a.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 updates from Hans-Christian Noren Egtvedt. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32: mmc: atmel: get rid of struct mci_dma_data mmc: atmel-mci: restore dma on AVR32 avr32: wire up missing syscalls avr32: wire up accept4 syscall
Diffstat (limited to 'include/net/udp_tunnel.h')
0 files changed, 0 insertions, 0 deletions