summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_tunnel.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 18:21:12 +0200
committerMark Brown <broonie@linaro.org>2014-08-04 18:21:12 +0200
commit0c18b7638a11af1a7b6727162f1a4a362d4ac7bf (patch)
tree84fcb8c29929d1a73f5aeff79b6fd7494804b7f1 /net/ipv4/ip_tunnel.c
parentMerge remote-tracking branches 'spi/topic/dw', 'spi/topic/efm32', 'spi/topic/... (diff)
parentspi: orion: Fix error return code in orion_spi_probe() (diff)
parentspi/pl022: Explicitly truncate large bitmask (diff)
parentspi: qup: Add support for v1.1.1 (diff)
parentspi/rockchip: fix error return code in rockchip_spi_probe() (diff)
parentspi: rspi: Handle dmaengine_prep_slave_sg() failures gracefully (diff)
downloadlinux-0c18b7638a11af1a7b6727162f1a4a362d4ac7bf.tar.xz
linux-0c18b7638a11af1a7b6727162f1a4a362d4ac7bf.zip
Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pl022', 'spi/topic/qup', 'spi/topic/rockchip' and 'spi/topic/rspi' into spi-next