Merge tag 'davinci-for-v3.18/board' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 Sep 2014 19:52:28 +0000 (21:52 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 4 Sep 2014 19:52:28 +0000 (21:52 +0200)
Merge "DaVinci board file fixes for v3.18" from Sekhar Nori:

Some non-critcal fixes for DA850 EVM board file
adding missing regulator information.

* tag 'davinci-for-v3.18/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: board-da850-evm: Add needed regulators for tlv320aic3106 codec
  ARM: davinci: board-da850-evm: Mark dcdc2 of TPS65070 as always_on

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

Trivial merge