Merge tag 'tegra-for-4.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel...

Merge tag 'tegra-for-4.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig

Merge "ARM: tegra: Default configuration updates for v4.2-rc1" from Thierry Reding:

This is a set of changes to the Tegra default configuration that enable
various new features (HDMI audio, watchdog) on Toradex Apalis T30.

* tag 'tegra-for-4.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Update default configuration