diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:24:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:24:48 +0200 |
| commit | 6bf99a6cb69f78de0083b76a7c033918f853f580 (patch) | |
| tree | ba451dc4faecd37cbea0eb21397ce4ddbab35c9b /net/ipv6/ip6_tunnel.c | |
| parent | Merge tag 'renesas-fixes-for-v4.14' of https://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | ARM: dts: sun6i: Fix endpoint IDs in second display pipeline (diff) | |
| download | linux-6bf99a6cb69f78de0083b76a7c033918f853f580.tar.xz linux-6bf99a6cb69f78de0083b76a7c033918f853f580.zip | |
Merge tag 'sunxi-fixes-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Pull "Allwinner fixes for 4.14" from Maxime Ripard:
Two fixes, one for the A31 DRM binding, and one for a missing regulator on
the pine MMC controller.
* tag 'sunxi-fixes-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun6i: Fix endpoint IDs in second display pipeline
arm64: allwinner: a64: pine64: Use dcdc1 regulator for mmc0
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
0 files changed, 0 insertions, 0 deletions