Merge tag 'sunxi-defconfig-for-4.11' of...

Merge tag 'sunxi-defconfig-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig

Pull "Allwinner defconfig changes for 4.11" from Maxime Ripard:

A single patch to enable the thermal DT support in sunxi_defconfig

* tag 'sunxi-defconfig-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Add CONFIG_THERMAL_OF

arch/arm/configs/sunxi_defconfig

@@ -83,6 +83,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_AXP20X_POWER=y
 CONFIG_THERMAL=y
+CONFIG_THERMAL_OF=y
 CONFIG_CPU_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y