Merge tag 'tegra-for-3.18-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 16:35:30 +0000 (17:35 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 16:35:30 +0000 (17:35 +0100)
commit4a8ab7713bcc8504228784b7796ae6d5089acd66
tree9e90191791d54e1e8511f3dfef817af798e6f777
parent5210436b8180bf406cdc9c85ed09a46bccfd6e64
parent221b9bf42b26a22e6904d20f35c53aec2e73a646
Merge tag 'tegra-for-3.18-fixes-for-rc5' of git://git./linux/kernel/git/tegra/linux into fixes

Pull "ARM: tegra: Device tree fixes for v3.18-rc5" from Thierry Reding:

This contains the serial port numbering fixes that are required for the
serial port numbering to stay the same with or without the serial core
making use of the aliases defined in DT.

eMMC is also fixed for TN7 and Roth boards which were using the wrong
regulators.

* tag 'tegra-for-3.18-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: roth: Fix SD card VDD_IO regulator
  ARM: tegra: Remove eMMC vmmc property for roth/tn7
  ARM: dts: tegra: move serial aliases to per-board
  ARM: tegra: Add serial port labels to Tegra124 DT

Signed-off-by: Arnd Bergmann <arnd@arndb.de>