summaryrefslogtreecommitdiff
path: root/include/linux/if_tunnel.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-05 22:06:09 (GMT)
committerOlof Johansson <olof@lixom.net>2013-02-05 22:06:25 (GMT)
commit61cfd8736040dd2d620278fb11c6c4acfeb041c9 (patch)
treea3191d768acd36a5aff52eabe0892860dfd96730 /include/linux/if_tunnel.h
parent7960ba89ca518ec99d2a937907f445a26b2a1628 (diff)
parent7dc0f27ea43151889ae762d321e4068dd90cd9e2 (diff)
downloadlinux-fsl-qoriq-61cfd8736040dd2d620278fb11c6c4acfeb041c9.tar.xz
Merge tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren: Minimal updates to OMAP board-*.c files while converting things to device tree based booting. * tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc RX-51: Register twl4030-madc device RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers ARM: OMAP1: nokia770: enable CBUS/Retu ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies ARM: OMAP2+: craneboard: support the TPS65910 PMU ARM: OMAP2+: craneboard: support NAND device ARM: OMAP3: cm-t3517: add MMC support ARM: OMAP2+: Remove apollon board support + Linux 3.8-rc6 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/if_tunnel.h')
0 files changed, 0 insertions, 0 deletions